Commit graph

3642 commits

Author SHA1 Message Date
Gig
07be177c6c Changes to aesu 2015-05-10 21:02:57 +01:00
modmuss50
9ffce3b355 Made some things public 2015-05-10 20:51:57 +01:00
Tntrololol
6353f02541 Reformat 2015-05-10 13:11:46 -05:00
Gig
1db1c02077 Added config to heatgen 2015-05-10 19:08:02 +01:00
Gig
0011125a2a Changed alloysmelter gui texture to new 2015-05-10 19:04:30 +01:00
Gig
e784681b56 Added gui/container to alloy furnace 2015-05-10 19:00:58 +01:00
modmuss50
88bb4db40f Testing of the ores in nei 2015-05-10 18:47:08 +01:00
Gig
808a3056a2 Test seems to render fine and look fine can undo later 2015-05-10 17:37:39 +01:00
Gig
8c5afc7b5e Fixed fluids not rendering in tanks (dont no why that worked but it did ) 2015-05-10 17:36:09 +01:00
Gig
0de33330e3 Fixed machine opening gui's while being wrenched now players must be sneaking to wrench machine 2015-05-10 17:06:08 +01:00
Gig
744a694142 Fixed returning wrong tile 2015-05-10 16:46:22 +01:00
Gig
ee0844bd0c Added HeatGenerator 2015-05-10 16:42:01 +01:00
Tntrololol
350580d76e Merge remote-tracking branch 'origin/master' 2015-05-09 18:42:25 -05:00
Tntrololol
60ce6187f1 Added another massive amount of localizations 2015-05-09 18:42:11 -05:00
Gig
50c2599305 Littlie more work on AESU 2015-05-09 20:47:05 +01:00
modmuss50
4d68b34143 Nei now shows correct stack size, crafting system now uses correct stack amount, fixed syncing issues. 2015-05-09 20:29:26 +01:00
Gig
3d92772004 Basic work on Aesu 2015-05-09 20:19:40 +01:00
Gig
e3bd172b96 Added gui and container for industrialelectrolyzer 2015-05-09 19:13:43 +01:00
Gig
266c547520 Small fix's to multiple things 2015-05-09 18:51:31 +01:00
Gig
f326bb8352 Fixed dragoneggsiphoner crash on server 2015-05-09 18:31:58 +01:00
Gig
d3d1bb8060 Finished on buckets 2015-05-09 17:52:37 +01:00
Gig
f6ff497405 Fluid buckets 2015-05-09 16:56:10 +01:00
Gig
7e8b236558 Added all the fluids 2015-05-09 16:11:48 +01:00
Gig
dc7e65a171 added buckets for other fluids 2015-05-09 14:51:18 +01:00
modmuss50
d6bd8b944f Clean up of testing code 2015-05-09 13:51:32 +01:00
modmuss50
c37858de79 Added command to reload oreDicRecipes 2015-05-09 13:42:47 +01:00
modmuss50
333ba855fe Some unfished work on doing the ore dic recipes in a better way 2015-05-09 09:03:10 +01:00
Tntrololol
48280690f5 Fixed a bunch of localizations 2015-05-08 23:59:10 -05:00
Tntrololol
8b0a1eb894 Merge remote-tracking branch 'origin/master' 2015-05-08 21:37:45 -05:00
Tntrololol
b5b2ea64fb Removed item text color as it is used only to denote rare items. 2015-05-08 21:37:38 -05:00
Gig
55656c13a5 More fluid stuff 2015-05-09 02:15:38 +01:00
Gig
1ae5a20517 More fluid stuff lot more TODO 2015-05-09 00:36:55 +01:00
Gig
77634fafd3 Start on fluid system 2015-05-08 23:53:58 +01:00
Gig
74e31f017b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-08 23:02:40 +01:00
Gig
b9d6b356c2 Most of the work done on dieselgenerator 2015-05-08 23:02:35 +01:00
Tntrololol
77dd80d047 Added fluid and gas textures 2015-05-08 16:52:27 -05:00
Tntrololol
a4bf97beac Merge remote-tracking branch 'origin/master' 2015-05-08 16:44:16 -05:00
Tntrololol
c3d38693bd Added Thermal Centrifuge recipes 2015-05-08 16:44:00 -05:00
Gig
ed99503fb2 Switched to the new rollingmachine gui 2015-05-08 22:33:06 +01:00
Gig
c6405da0dd Little clean up 2015-05-08 22:28:37 +01:00
Gig
5511a65507 Somthing is having issues I blame @Mj11jM ;) 2015-05-08 22:06:15 +01:00
Gig
4f333c70ae NEIhandlers for alloysmelter and assemblingmachine 2015-05-08 21:34:59 +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
446f94770d Added untested OreDictionary support 2015-05-08 21:07:59 +01:00
modmuss50
0bf7af8a84 Added saving crafting time to nbt 2015-05-08 20:43:28 +01:00
modmuss50
ed249fdf75 It works :) 2015-05-08 20:39:14 +01:00
modmuss50
7315e23864 Some code, it does not work 2015-05-08 20:29:13 +01:00
modmuss50
d27993ba5f Fixed cables not connecting to our tiles 2015-05-08 19:42:52 +01:00
modmuss50
d6ddaa002a some changes, will have a better look at this later 2015-05-08 19:03:09 +01:00