Commit graph

30 commits

Author SHA1 Message Date
modmuss50
510f969c94 Auto remove un needed things in the code 2016-04-03 14:34:39 +01:00
modmuss50
5846f1c784 Remove debug code, and 1.0.2 2016-03-27 17:58:41 +01:00
modmuss50
a0dea07407 Fix multiblocks 2016-03-27 12:51:39 +01:00
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
006b611fa3 Fix another merge error 2016-01-16 13:16:55 +00:00
modmuss50
2a617919d9 Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9
# Conflicts:
#	src/main/java/techreborn/compat/fmp/ForgeMultipartCompat.java
#	src/main/java/techreborn/tiles/TileBlastFurnace.java
2016-01-16 13:09:09 +00:00
gigabit101
77bfbc46f8 closes #311 2016-01-16 04:32:58 +00:00
Modmuss50
eedabb9e7d Merge remote-tracking branch 'remotes/origin/master' into 1.8.8
# Conflicts:
#	src/main/java/techreborn/client/gui/GuiGrinder.java
#	src/main/java/techreborn/tiles/TileGrinder.java
2015-12-16 16:06:33 +00:00
Modmuss50
96a7b56b5f Fixes #304 2015-12-16 15:56:12 +00:00
Modmuss50
92ca6548c6 2211 2015-11-23 15:15:42 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
modmuss50
fb33dda932 Changes the way heat is calculated. 2015-08-10 14:32:01 +01:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
Gig
1f9600b33c Organized imports
Changed centrifuge to new recipe system
2015-05-19 23:00:36 +01:00
modmuss50
88bb4db40f Testing of the ores in nei 2015-05-10 18:47:08 +01:00
modmuss50
7f7beaa4e1 added this file? Whats up with you git? 2015-05-08 21:23:32 +01:00
modmuss50
c6d9f302c3 Fixed ore dic, and some work on multi blocks 2015-05-08 21:23:04 +01:00
modmuss50
2901466288 Started work on the multiBlock 2015-05-04 08:44:44 +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
Modmuss50
1209c78345 The gui now only opens if there is is a full structure next to it. 2015-04-17 21:13:15 +01:00
Modmuss50
e7096178cf Added basic 3x3x4 multiblock. Next I need to allow it accept lava, and use different machine casings. 2015-04-17 20:40:33 +01:00
Modmuss50
bb58ae8632 This was to complicated, going to make it simpler 2015-04-17 20:00:30 +01:00
Modmuss50
c4dd21b39e Fixed some compile errors again, sorry :( 2015-04-17 18:24:52 +01:00
Modmuss50
8d8814bb77 Fixed compile errors with last commit, sorry 2015-04-17 17:46:45 +01:00
Modmuss50
1eb3ef3db6 Some more work on the multiblock system 2015-04-17 17:42:57 +01:00