Commit Graph
7 Commits
Author SHA1 Message Date
Jason Mitchell 275d137ba8 [ci skip] spotlessApply with the new settings 2023-01-28 18:30:34 -08:00
Raven Szewczyk cf41b89ae4 Update buildscript & spotlessApply (#78)
* Update buildscript & spotlessApply

* Add mapping version
2022-07-21 18:26:15 +07:00
tterrag1098 6324c7ee69 Merge branch 'master' into endercore
Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
2015-05-20 10:35:59 -04:00
tterrag1098 6215e39410 Fix machine active state blinking in between successive tasks 2015-05-18 15:16:05 -04:00
tterrag1098 aa06543988 Move base block/TE to EnderCore 2015-05-03 23:25:53 -04:00
tterrag1098 7bbadc67c5 Remove EnderCore code and port to using EnderCore 2015-04-29 22:47:32 -04:00
tterrag1098 0c105c7c78 Lots of telepad function/GUI work, add some rudimentary rendering 2015-02-16 00:11:52 -05:00