Commit graph

314 commits

Author SHA1 Message Date
Modmuss50
37d8f35aee Ok last time, i check i promise 2015-04-17 18:27:44 +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
8f33305025 Merge branch 'master' of https://github.com/TechReborn/TechReborn
Conflicts:
	src/main/java/techreborn/Core.java
2015-04-17 17:43:44 +01:00
Modmuss50
1eb3ef3db6 Some more work on the multiblock system 2015-04-17 17:42:57 +01:00
Gig
d5628ff93a Added basic achievements 2015-04-17 15:53:54 +01:00
Gig
8bd7974a74 Fixed some gui textures 2015-04-17 15:53:33 +01:00
Gig
b505eeaf30 Added base Ic2 ores 2015-04-17 12:47:10 +01:00
Modmuss50
cad9b8cc56 Initial work on the multiblock system 2015-04-17 11:23:51 +01:00
modmuss50
1f1096dd49 Fixed crash on place 2015-04-17 08:28:07 +01:00
Gig
dc6d186f67 Start on Blast furnace will get @modmuss50 to finish 2015-04-17 01:09:12 +01:00
Gig
4a3214320c Added Machine casings
Added more textures
2015-04-17 00:15:33 +01:00
Gig
3c87b1ad1d Added cells 2015-04-16 23:42:05 +01:00
Gig
7cbd27150e Added small dusts 2015-04-16 23:27:25 +01:00
Gig
39a8ffe739 Changed name of chestplate to gravity chest plate 2015-04-16 23:26:50 +01:00
Gig
5c3e72ea0d Added hardness to Centrifuge 2015-04-16 23:26:03 +01:00
modmuss50
f599a262b2 fixed incorrect cells 2015-04-15 21:11:34 +01:00
Modmuss50
7e0119bce6 Added more nei handers. 2015-04-15 17:46:35 +01:00
Modmuss50
b7ccae4b8c Got the RollingMachine working 2015-04-15 17:27:05 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Modmuss50
c001231216 Added nei support for centrifuge 2015-04-15 16:22:15 +01:00
modmuss50
bdea893392 More configs and ISidedInventory 2015-04-14 21:23:45 +01:00
modmuss50
a6451e7946 Removed unneeded null checks. 2015-04-14 19:24:40 +01:00
modmuss50
3e2a3cfaa8 Fixed wrench drops 2015-04-14 19:23:16 +01:00
Gig
60bcbd10ad Moved/Replaced Textures 2015-04-14 16:21:23 +01:00
Gig
8191e1eaaa Added Tcon dusts/ingots 2015-04-14 14:41:53 +01:00
Gig
b51a1d498c Even more configs !! 2015-04-14 13:15:47 +01:00
Gig
7d48b81baf made machines wrenchable 2015-04-14 12:57:43 +01:00
Modmuss50
777f54cefd Fixed itemstacks having a null item in them. 2015-04-14 11:09:13 +01:00
Modmuss50
f49b8c27c2 Fixed the centrifuge, still needs some testing. 2015-04-14 08:35:44 +01:00
Gig
4746968a04 Moved batpack/lapotronpack to Items/Armor
Added Gravity Chestplate (WIP)
2015-04-14 01:09:38 +01:00
Gig
700276fb09 Failing ;) 2015-04-14 00:12:24 +01:00
Modmuss50
84ee22b859 Fixed a few crashes, will finish fixing them tomorrow. 2015-04-13 21:02:30 +01:00
Modmuss50
7e9031352a It seams like it works :), still needs some testing. 2015-04-13 20:54:31 +01:00
Modmuss50
822879a6b6 Made it work, need to figure out the ic2 cells, for now it uses resin 2015-04-13 20:36:16 +01:00
Modmuss50
1824e0bf36 WAILA now shows all of the items in the chest 2015-04-13 20:06:20 +01:00
Modmuss50
d45bd4e85c Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 20:00:29 +01:00
Modmuss50
2a7b9e19ee Added basic Centrifuge logic. Not finished 2015-04-13 19:59:52 +01:00
Gig
6dec53208e More Configs!!!!! 2015-04-13 19:50:35 +01:00
Gig
dbb6a9edf2 Added advanced drill
Added TorchHelper.class
2015-04-13 19:08:17 +01:00
Gig
82a760a564 whoops 2015-04-13 18:51:39 +01:00
Gig
831eacbd29 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-04-13 18:43:47 +01:00
Gig
4a291087ad Added omnitool 2015-04-13 18:43:31 +01:00
Modmuss50
bd357e0a2c Added the basic gui, block and tile for the centrifuge 2015-04-13 18:40:13 +01:00
Gig
2b0fd80def Fixed a few spelling mistakes in config 2015-04-13 00:55:53 +01:00
Gig
49474e741e Added charged/uncharged tools to creative tab 2015-04-12 23:39:38 +01:00
Gig
bdc34c393d Added LapotronPack 2015-04-12 23:38:30 +01:00
Gig
a46645ff42 Added lithiumbatpack 2015-04-12 23:22:53 +01:00
Gig
da6e88c254 Added rockcutter 2015-04-12 22:45:13 +01:00
Gig
e5110e2e92 Added textures for storage blocks 2015-04-12 21:16:05 +01:00