Commit graph

17 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
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +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
009bf28b95 Added version checker 2015-08-06 18:39:13 +01:00
modmuss50
5927eaca4c Recoded idsu, closes #81 2015-07-26 16:01:27 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
modmuss50
598badc375 A load of work on the system, seams a lot is broken. 2015-06-17 17:01:26 +01:00
Gig
98c8f43b84 Added keybinding to toggle if hud is shown 2015-06-14 20:53:05 +01:00
Gig
89f24a0c4d Start on charge hud 2015-06-11 23:23:14 +01:00
modmuss50
37258cb84c Removed vanilla multipart compact. (This is why I love modularisation) 2015-06-06 21:56:55 +01:00
modmuss50
b99cac1a1c Server now starts 2015-04-28 20:38:13 +01:00
Gig
a05b0d01bf More worldgen config pokes @Mj11jM ;) 2015-04-27 22:39:33 +01:00
Modmuss50
083c24c901 Added all cables, needs a lot of testing :P 2015-04-24 21:22:09 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
e889b00b6f Added Proxys will need these soon 2015-04-23 20:29:26 +01:00