From 867b404ffc9945f7d9411c6f520c2e346722cd0c Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Sun, 18 Jun 2017 17:27:39 +0200 Subject: [PATCH] use J8 to join string, fixes #1309 also update README to display build status of correct branch --- README.md | 2 +- .../refinedstorage/gui/grid/stack/GridStackItem.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 61d5dca78..d49cdaa86 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Refined Storage [![Build Status](https://travis-ci.org/raoulvdberge/refinedstorage.svg?branch=mc1.10)](https://travis-ci.org/raoulvdberge/refinedstorage) [![Download](https://api.bintray.com/packages/raoulvdberge/dev/refinedstorage/images/download.svg)](https://bintray.com/raoulvdberge/dev/refinedstorage/_latestVersion) [![CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) +# Refined Storage [![Build Status](https://travis-ci.org/raoulvdberge/refinedstorage.svg?branch=mc1.12)](https://travis-ci.org/raoulvdberge/refinedstorage) [![Download](https://api.bintray.com/packages/raoulvdberge/dev/refinedstorage/images/download.svg)](https://bintray.com/raoulvdberge/dev/refinedstorage/_latestVersion) [![CurseForge](http://cf.way2muchnoise.eu/full_243076_downloads.svg)](http://minecraft.curseforge.com/projects/refined-storage) An elegant solution to your hoarding problem. diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java index d6e28dd6c..28a10023c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java @@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.gui.grid.stack; import com.raoulvdberge.refinedstorage.RSUtils; import com.raoulvdberge.refinedstorage.gui.GuiBase; import io.netty.buffer.ByteBuf; -import joptsimple.internal.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -88,7 +87,7 @@ public class GridStackItem implements IGridStack { } } - return Strings.join(lines, "\n"); + return lines.stream().collect(Collectors.joining("\n")); } @Override