Commit graph

468 commits

Author SHA1 Message Date
modmuss50
6bd2818e74 fixed input stack size 2015-05-16 16:55:54 +01:00
Gig
f9074e5b37 Added battery and upgrade slots to chemical reactor 2015-05-15 17:46:03 +01:00
Gig
83259b0615 Fixed Chemical Reactor gui name 2015-05-15 17:37:33 +01:00
Gig
44abbfd79f Added missing uurecipes 2015-05-15 17:29:12 +01:00
Gig
fc11db09cc Added bucket textures to items 2015-05-15 17:05:18 +01:00
Gig
2b652f0502 I should remember when I update forge to run gradlew eclipse 2015-05-15 16:52:16 +01:00
Gig
ceeda641a6 Commented out all doesOreNameExist recipes 2015-05-15 16:45:27 +01:00
Gig
f1fd0af052 Now checks for ee3 2015-05-15 16:27:40 +01:00
Tntrololol
3c0bd5a54f Added remaining alloy smelter recipes 2015-05-14 22:19:52 -05:00
Tntrololol
158fdd338a Fixed custom macerator recipes showing up as fire in NEI if ores were not present. 2015-05-14 16:03:19 -05:00
Tntrololol
24180fd5b1 Merge remote-tracking branch 'origin/master' 2015-05-13 17:32:03 -05:00
Tntrololol
fdec643bbb Added bucket textures 2015-05-13 17:31:48 -05:00
Gig
55a3acff14 Little things for later 2015-05-13 22:22:14 +01:00
Tntrololol
5a57dc5817 Merge remote-tracking branch 'origin/master' 2015-05-12 13:26:35 -05:00
Tntrololol
65dd53c6ec Added machine GUI progress bars 2015-05-12 13:26:23 -05:00
Gig
bf49bd2136 Added upgrade slots to AssemblingMachine 2015-05-12 16:05:15 +01:00
Gig
13957467a1 Added battery slot and upgrade slots to alloy smelter 2015-05-12 15:58:20 +01:00
Gig
a23243cd02 Added ChemicalReactor 2015-05-12 00:17:17 +01:00
Gig
1de5de9cec Quick fix to platecuttingmachine 2015-05-12 00:01:33 +01:00
Gig
f84d9edc06 Finish plate cutting machine 2015-05-11 23:50:49 +01:00
Gig
2ab94e6030 Fixed Lathe recipe handler 2015-05-11 23:44:26 +01:00
Tntrololol
c9c5adf4ab Experimenting with GUI progress bars 2015-05-11 17:29:37 -05:00
Tntrololol
9f25a41a3d Merge remote-tracking branch 'origin/master' 2015-05-11 17:26:34 -05:00
Tntrololol
0818405215 Temporarily removed world.isRemote() check to fix crafter sync issue. 2015-05-11 17:26:26 -05:00
Gig
0dde18f7e0 getting things ready for achievements 2015-05-11 23:00:29 +01:00
Gig
1bddb1747f Fix for the ticktime 2015-05-11 22:08:32 +01:00
Tntrololol
f3d346f6d1 Added fuel rod textures 2015-05-11 16:07:02 -05:00
Tntrololol
6a157f880e Merge remote-tracking branch 'origin/master' 2015-05-11 15:59:39 -05:00
Tntrololol
438541dfa4 Fixed missing textures and localizations 2015-05-11 15:59:24 -05:00
Gig
cf1074d637 Small tweeks 2015-05-11 21:53:47 +01:00
Gig
988747e98a Fixed plate cutting machine not storing inv to nbt 2015-05-11 18:04:28 +01:00
Gig
a8a46352c8 Added Industrial Sawmill pokes @modmuss50 to look at the nei handler crash issue bet I did it wrong 2015-05-11 17:04:27 +01:00
Gig
3fe5605de3 quick fix 2015-05-11 15:49:58 +01:00
Gig
fa2ebfa639 Added ConfigChangedEvent 2015-05-10 22:20:20 +01:00
modmuss50
f0fa0c0cdc Fixed Grinder crash on place 2015-05-10 21:45:43 +01:00
modmuss50
6648868944 Fixed crash when placing matter fab 2015-05-10 21:40:24 +01:00
Tntrololol
51071be80c Merge remote-tracking branch 'origin/master' 2015-05-10 15:39:27 -05:00
Tntrololol
792ab032ba Fixed/Updated GUIs 2015-05-10 15:39:19 -05:00
modmuss50
03cd665add Nei Handlers now show all ores 2015-05-10 21:03:48 +01:00
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
modmuss50
86c3e99666 It crafts to a point 2015-05-08 18:42:15 +01:00
Gig
752751319a Added Dragoneggsiphoner power 2015-05-08 18:19:03 +01:00
Tntrololol
6a78464668 More recipe stuff 2015-05-08 00:12:25 -05:00
Gig
b7ae806987 Block clean up 2015-05-08 00:39:17 +01:00
Gig
4e551abb8f Fixed platecuttingmachine gui name 2015-05-08 00:31:21 +01:00
Gig
67e97707ff Added platecuttingmachine 2015-05-08 00:30:59 +01:00
Gig
3ab786b3aa Fixed derp 2015-05-08 00:23:15 +01:00
Gig
aaee829f3b Added recipe buttons 2015-05-08 00:20:13 +01:00
Gig
2157fe1cb4 Added Lathe 2015-05-08 00:15:04 +01:00
Gig
c6e3dfaf82 Added tile/recipehandler/gui for Assembling Machine 2015-05-07 23:39:26 +01:00
Tntrololol
111cd541b5 Added missing galena ore items 2015-05-07 17:29:01 -05:00
Tntrololol
87dcd49174 Swapped Tin and Copper ore for Tetrahedrite and Cassiterite 2015-05-07 17:18:11 -05:00
Gig
e01058fca6 Changed the AlloySmelter recipe handler to new system 2015-05-07 23:11:34 +01:00
Modmuss50
f075d6391c Some more work on the crafting system, almost done it.
It was a lot easier that I thought it would be
2015-05-07 21:12:07 +01:00
modmuss50
12bea10af6 More work on the recipe system. 2015-05-07 20:38:11 +01:00
modmuss50
4d66bb9e9d Started working on the recipe system 2015-05-07 20:16:19 +01:00
Tntrololol
85e7503aa6 Merge remote-tracking branch 'origin/master' 2015-05-07 12:40:09 -05:00
Tntrololol
4f0942f215 Added a ton of IC2 crafting recipes 2015-05-07 12:39:47 -05:00
Gig
579558827b Added alloy smelter recipes to API 2015-05-07 17:04:07 +01:00
Gig
049afe676d Added recipe handler for alloy smelter 2015-05-07 17:00:34 +01:00
Tntrololol
e8fc6d5a07 Fixed ore dict registration and missing items 2015-05-05 19:50:34 -05:00
Tntrololol
f8cec1f21c fixed silver and lead ingot texture files 2015-05-04 22:48:43 -05:00
Tntrololol
01f0edd5d0 added missing tin plate icon 2015-05-04 22:45:15 -05:00
Tntrololol
558aef45e8 added IC2 ingots for standalone capability 2015-05-04 22:37:59 -05:00
Tntrololol
9232de5eb6 fixed file name 2015-05-04 22:23:39 -05:00
Tntrololol
47c4a1cf59 test 2015-05-04 22:22:36 -05:00
Tntrololol
1685410a35 Modified nugget names 2015-05-04 20:00:22 -05:00
Tntrololol
8b106ecbcd Changed icon directory 2015-05-04 19:45:24 -05:00
Tntrololol
fc7f25f699 Added names for purified crushed ores 2015-05-04 19:30:45 -05:00
Tntrololol
57780d23ed Added names for crushed ores 2015-05-04 19:24:47 -05:00
Tntrololol
6c4b87e07a Changed "aluminium" to "aluminum" to fix missing icon 2015-05-04 19:16:15 -05:00
Tntrololol
32765a4343 Updated plate names 2015-05-04 18:30:13 -05:00
Tntrololol
a66834cf88 Fixed copy paste error
I should really download eclipse...
2015-05-04 18:15:30 -05:00
Tntrololol
e5efe4f28a Fixed capitalization and icon directory string 2015-05-04 18:06:37 -05:00
Tntrololol
ef0afe7269 Fixed spelling mistake 2015-05-04 18:03:56 -05:00
Tntrololol
e59e954c55 Added metal rods 2015-05-04 17:58:06 -05:00
Gig
6495498bfb Fixed I hope 2015-05-04 22:05:23 +01:00
Gig
6b55d2e6a3 Broken build 2015-05-04 22:04:51 +01:00
Gig
1d0166b09f textures!!!! 2015-05-04 21:55:08 +01:00
Gig
f4a717c0ea All the items 2015-05-04 21:52:08 +01:00
Gig
617a33aea3 More machines 2015-05-04 21:26:51 +01:00
Gig
88080bccb9 Fixed textures for casing 2015-05-04 21:02:39 +01:00
Tntrololol
e780191616 More syntax errors... 2015-05-04 13:59:19 -05:00
Tntrololol
5378cd2134 Added various missing parts and reactor components 2015-05-04 13:57:15 -05:00
Tntrololol
a303ddad62 Fixed yellow garnet misspelling. 2015-05-04 13:31:31 -05:00
modmuss50
37b5aa73ba Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-05-04 19:07:50 +01:00
modmuss50
7f52e4f5e0 Fixed incorrect textures 2015-05-04 19:07:22 +01:00
Gig
465519cbd0 Added things 2015-05-04 19:06:42 +01:00
Gig
6ad1c8bdea Added aesu 2015-05-04 19:01:03 +01:00
modmuss50
7257da06e9 Added a massive amount of textures from @Tntrololol 2015-05-04 18:40:45 +01:00
modmuss50
2901466288 Started work on the multiBlock 2015-05-04 08:44:44 +01:00
modmuss50
77fb5949b9 Fixed compile errors 2015-05-04 08:02:01 +01:00
Tntrololol
9aff74fddc Missed a few 2015-05-03 23:37:20 -05:00
Tntrololol
77f761f1a6 Missed one 2015-05-03 23:36:55 -05:00
Tntrololol
6884f4ff1c Added missing ingots and fixed capitalization
Added ingots for antimony, battery alloy, red alloy, blue alloy, cadmium, cupronickel, indium, kanthal, lodestone, magnalium, nichrome, and tellurium.
2015-05-03 23:35:13 -05:00
Tntrololol
46a10b8cc7 Replaced olivine with peridot 2015-05-03 23:28:28 -05:00
Tntrololol
859ebc047e Fixed copy paste mistake
Sorry, currently not using an IDE.
2015-05-03 23:27:02 -05:00
Tntrololol
220febc0c5 Added missing small dusts and fixed capitalization
Added small dusts for antimony, biotite, cadmium, cupronickel, dark iron, glowstone, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, "redstone", silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
2015-05-03 23:25:23 -05:00
Tntrololol
636528bddc Added missing dusts and fixed capitalization
Added dusts for antimony, biotite, cadmium, cupronickel, dark iron, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
2015-05-03 23:17:09 -05:00
Tntrololol
982ec40192 Added tritium cell 2015-05-03 22:54:38 -05:00
Gig
d6b38f238e test fix for no textures on ingots 2015-05-04 00:18:35 +01:00