Commit graph

43 commits

Author SHA1 Message Date
modmuss50
5eed5b161d Code formatter take 2 2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31 Revert "Added code formatter"
This reverts commit b9448d5d90.
2016-03-24 00:41:47 +00:00
modmuss50
b9448d5d90 Added code formatter 2016-03-24 00:39:26 +00:00
modmuss50
9a40abbe78 Now comes the grind, 244 errors left 2016-03-13 16:08:30 +00:00
modmuss50
7f920b282f Optimise imports to make it easier to find and replace package names 2016-03-13 15:37:55 +00:00
gigabit101
6549282ea0 Cleaned up imports 2016-02-26 13:03:30 +00:00
modmuss50
28dd5044e6 Fixes #347 2016-02-21 14:16:55 +00:00
modmuss50
b588e8c08a IC2 Classic API support (This is all you are getting)
If this is broken I dont care, if it has broken other things I will care.
2016-01-07 10:46:13 +00:00
mezz
ff571d5444 Add blast furnace recipes 2015-12-30 22:28:58 -08:00
Modmuss50
9f3622ea33 some more texture work 2015-11-25 21:03:55 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
b88fe49ee2 1936 2015-11-23 18:41:29 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
Modmuss50
fa9cd98b5a 4693 2015-11-23 14:47:50 +00:00
Modmuss50
011ebaba1d 4862 2015-11-23 14:45:16 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
6ab71cb612 Fixed compile error 2015-11-11 15:28:20 +00:00
modmuss50
d4222693c0 Cleaned up Item Power System 2015-11-08 13:59:36 +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
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
modmuss50
2f88e819a3 Mulitblock preview now renders behind the block. 2015-11-01 16:04:19 +00:00
gigabit101
824d7d0e8e Added button to blast furnace gui to show multiblock in world 2015-11-01 15:58:06 +00:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
79f14f8be6 Fixes Crash without CodeChickenLib installed closes #94 2015-08-05 15:10:29 +01:00
modmuss50
462aa20710 Fixed the BlastFurnace 2015-07-20 15:19:23 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
d1196d0a7c Removed Recipes button and moved to progress bar 2015-06-27 10:01:39 +01:00
Gig
6cc1071961 made Dungeon loot easy to add 2015-06-26 17:22:58 +01:00
Gig
805f02effb Moved Blast furnace heat value in gui 2015-06-26 01:31:47 +01:00
Gig
c11086243b Missing Multiblock message can now be localized 2015-06-26 01:28:18 +01:00
Gig
759346f388 Added Missing Multiblock to gui's 2015-06-26 01:15:44 +01:00
Gig
1f9600b33c Organized imports
Changed centrifuge to new recipe system
2015-05-19 23:00:36 +01:00
Tntrololol
792ab032ba Fixed/Updated GUIs 2015-05-10 15:39:19 -05:00
Gig
266c547520 Small fix's to multiple things 2015-05-09 18:51:31 +01:00
modmuss50
39492fadbd Added button for recipes, fixed syncing with tanks 2015-05-03 14:31:19 +01:00
modmuss50
68c3437316 it compiles now :) 2015-05-01 20:04:31 +01:00
modmuss50
2616894527 Some small tweaks to the blast furnace, not tested 2015-05-01 19:50:31 +01:00
Gig
8dda3c5ef5 Doing stuff and things 2015-04-29 13:34:08 +01:00
modmuss50
db62b7a8b8 Now shows the heat of the multiblock 2015-04-26 16:22:26 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
dc6d186f67 Start on Blast furnace will get @modmuss50 to finish 2015-04-17 01:09:12 +01:00