Commit graph

24 commits

Author SHA1 Message Date
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
47a466ef21 Some fixes for #242 2015-11-11 15:24:13 +00:00
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
65d20ec431 Fixes #221 and hides the multiblock when the world is closed. 2015-11-02 15:15:22 +00:00
MrBretzel
1307406e10 Adding iron alloy smelter to not enough items and fix ChargedHud possible crash 2015-11-01 23:10:32 +01:00
modmuss50
dabe79a877 Removed ChatColor and replaced with ChatFormatting 2015-10-25 18:55:49 +00:00
modmuss50
cf34fe1f1f Large improvement to power system, fixes #204 2015-10-25 09:58:57 +00:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
gigabit101
bac2cdcbc6 closes #55 2015-07-24 22:29:00 +01:00
modmuss50
496151fcae Fixed aesu powers in creative tab, more work moving away from ic2 core and only needing ic2 api 2015-07-23 13:42:20 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
c11086243b Missing Multiblock message can now be localized 2015-06-26 01:28:18 +01:00
modmuss50
10eb1eda45 Clean fix for #42 2015-06-23 19:39:39 +01:00
Gig
98c8f43b84 Added keybinding to toggle if hud is shown 2015-06-14 20:53:05 +01:00
modmuss50
51c91aaccb Added lesu storage block counting 2015-06-14 13:35:36 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
4b7b9d4fd2 Removed unused lib 2015-04-23 19:11:30 +01:00
Modmuss50
49d0e480e1 Removed modmussCore 2015-04-20 21:30:24 +01:00
Gig
1a68b5c7c6 Clean
New achievements
Renamed Manuel to PDA
Moved PDA class's to PDA package
2015-04-18 21:24:49 +01:00
Gig
d5628ff93a Added basic achievements 2015-04-17 15:53:54 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Gig
a054ac6eba Added config and GuiConfig 2015-04-11 18:11:37 +01:00
Gig
f77e932ef5 Added mod dependencies
Moved Modname and modid to ModInfo.class
2015-04-11 17:12:07 +01:00