Commit graph

15 commits

Author SHA1 Message Date
modmuss50
ef03cf50a9 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/asm/LoadingPlugin.java
	src/main/java/techreborn/client/gui/GuiBlastFurnace.java
	src/main/java/techreborn/client/render/MultiblockRenderEvent.java
	src/main/java/techreborn/compat/recipes/RecipesIC2.java
	src/main/java/techreborn/init/ModItems.java
	src/main/java/techreborn/lib/Location.java
	src/main/java/techreborn/packets/PacketPipeline.java
	src/main/java/techreborn/partSystem/fmp/CableConverter.java
2015-11-08 12:34:18 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
Modmuss50
2c56961289 Fixes #226 2015-11-03 11:18:22 +00:00
Modmuss50
65d20ec431 Fixes #221 and hides the multiblock when the world is closed. 2015-11-02 15:15:22 +00:00
gigabit101
90f0b0ae5b Little work on multiblock page 2015-10-09 23:16:44 +01:00
modmuss50
fd4f52e27e Fixed some issues with cables when using ic2 classic. 2015-10-03 19:21:28 +01:00
Modmuss50
081f16a533 Removed Farm 2015-09-23 18:58:46 +01:00
Modmuss50
adf6c95331 Small improvements to the multiblock renderer 2015-09-05 15:29:21 +01:00
modmuss50
2e00382632 Some work for #115 2015-08-26 10:37:28 +01:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
29398d50dd Added Farm inventory cable 2015-07-14 17:18:00 +01:00
modmuss50
33898edf7c Rewritten cable render, removed hard dep of QLIb :) 2015-07-02 19:49:30 +01:00
modmuss50
37467cab7e Some improvements to render speed of cables 2015-06-25 20:10:03 +01:00
Gig
54845b8777 Test fix for server craft 2015-06-24 01:15:19 +01:00
modmuss50
b99cac1a1c Server now starts 2015-04-28 20:38:13 +01:00