mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Fix merge conflicts
This commit is contained in:
commit
91271f6bb2
22 files changed
+38
-606
No files matched your search
@@ -10,7 +10,7 @@ import javax.swing.ImageIcon;
|
||||
import net.minecraft.client.entity.AbstractClientPlayer;
|
||||
import net.minecraftforge.client.event.RenderPlayerEvent;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import tconstruct.util.EnvironmentChecks;
|
||||
import mantle.lib.environment.EnvironmentChecks;
|
||||
|
||||
public class EventCloakRender
|
||||
{
|
||||
|
||||
@@ -343,7 +343,7 @@ public class CraftingStationGui extends GuiContainer
|
||||
if (logic.doubleChest == null)
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize);
|
||||
else
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 121, this.ySize + 21);
|
||||
this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.ySize + 21);
|
||||
}
|
||||
|
||||
// Draw description
|
||||
|
||||
Reference in new issue
Block a user