Commit graph

800 commits

Author SHA1 Message Date
joflashstudios
202c562936 Adding fix for #19 to semifluid and thermal generators. 2015-06-06 17:36:45 -04:00
modmuss50
972efc4481 A commit, it might be the answer to everything 2015-06-06 21:59:54 +01:00
modmuss50
37258cb84c Removed vanilla multipart compact. (This is why I love modularisation) 2015-06-06 21:56:55 +01:00
modmuss50
b45711f3f1 A fix that works :) (I hope) 2015-06-06 21:53:24 +01:00
modmuss50
0bd8d3e42b fix import 2015-06-06 21:44:32 +01:00
modmuss50
4d76a3071d My mind is blown :D Not sure whats up 2015-06-06 21:41:41 +01:00
joflashstudios
ee798923f5 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-06 15:58:37 -04:00
joflashstudios
b01399f2b5 Fixed helium coolant cell textures. 2015-06-06 15:57:53 -04:00
Gig
3114dc9194 Machines now return machine blocks unless wrenched 2015-06-06 20:55:02 +01:00
joflashstudios
ca98fffe64 Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-06 15:48:18 -04:00
joflashstudios
71c445d1ed Fixed tetrahedrite ore texture. This gets rid of the different texture per-side feature, because it's incompatible with the ore texture loader we're using. I don't think it's worth writing custom code just so tetrahedrite can have more than one texture. 2015-06-06 15:37:52 -04:00
joflashstudios
4c018dc7ad Added textures for all TechReborn fluids. 2015-06-06 15:34:54 -04:00
modmuss50
c9821db075 Revert "modUpdates!"
This reverts commit 7243115645.
2015-06-06 20:26:08 +01:00
modmuss50
6f8ce4392b Merge branch 'master' of https://github.com/TechReborn/TechReborn 2015-06-06 20:24:13 +01:00
modmuss50
7243115645 modUpdates! 2015-06-06 20:23:56 +01:00
Gig
b423ffd1a5 Gem ores now return gems 2015-06-06 19:54:39 +01:00
modmuss50
27dc043946 updated to gradle 2.4, should speed some things up aparently 2015-06-06 13:40:01 +01:00
modmuss50
9ee06aed89 Fix saying with gas turbine 2015-06-06 09:07:23 +01:00
modmuss50
6f80bf7e72 Initial port of fluid gui code to nei. Needs some rearraning 2015-06-06 09:04:56 +01:00
modmuss50
56619a0ac4 Fixed grinder not syncing, started work on the nei handler for it, will add the fluid for it in a bit 2015-06-06 08:01:24 +01:00
Modmuss50
28d618632e Merge pull request #23 from joflashstudios/master
Added gas turbine. Still missing recipe and some config elements.
2015-06-06 07:53:24 +01:00
modmuss50
379b6a96da finished fixing #19 2015-06-06 07:52:00 +01:00
modmuss50
8a1f0a18cd Fixed crash when saving not, fixes saving items, fixes #19 2015-06-06 07:32:20 +01:00
joflashstudios
48dd12aa5a Added gas turbine. Still missing recipe and some config elements. 2015-06-05 16:24:52 -04:00
Modmuss50
2e041d0168 Merge pull request #21 from joflashstudios/master
Added other fluids to semifluid generator
2015-06-05 17:38:03 +01:00
joflashstudios
0a965d0b5e Added support for biofuel, bioethanol, and fuel to the semifluid generator, using the eu values from http://ftbwiki.org/Semifluid_Generator_%28IndustrialCraft_2%29 2015-06-05 10:17:58 -04:00
joflashstudios
55521b22b1 Revert "Added biofuel, bioethanol, and fuel support to semifluid generator."
This reverts commit eb1bd68a95.
2015-06-05 10:16:05 -04:00
joflashstudios
c7047fea2b Merge branch 'master' of https://github.com/joflashstudios/TechReborn 2015-06-05 10:08:14 -04:00
joflashstudios
eb1bd68a95 Added biofuel, bioethanol, and fuel support to semifluid generator. 2015-06-05 10:05:55 -04:00
joflashstudios
01fb356c8b Merge pull request #2 from TechReborn/master
Merge pull request #20 from joflashstudios/master
2015-06-05 09:50:04 -04:00
Modmuss50
87f8602e0b Merge pull request #20 from joflashstudios/master
Added Semifluid Generator
2015-06-05 07:53:33 +01:00
joflashstudios
81273e33ad Added Semifluid generator. Suffers from issue #19 as well. 2015-06-04 23:34:04 -04:00
joflashstudios
9b74c5438f Merge pull request #1 from TechReborn/master
Updating fork
2015-06-02 16:33:26 -04:00
modmuss50
0749385e49 About to give up. Here is what ive got. 2015-06-01 21:29:39 +01:00
modmuss50
34530fa6ca Improve part server peformance 2015-06-01 21:08:28 +01:00
modmuss50
31574f2cdd Some fixes, some breakages 2015-05-31 18:54:58 +01:00
modmuss50
0419c0dfa6 Fixed progress bar outputs 2015-05-31 11:10:43 +01:00
modmuss50
1e656b26e7 Now sync to the client side tile, not the container. 2015-05-31 10:45:08 +01:00
Gig
17ed2d163d Ores can now be silk tuched
Started on ores returning ItemGems
TODO finish
2015-05-31 01:59:43 +01:00
modmuss50
90df1fe398 only adds emc values for recipes with one output 2015-05-30 13:49:48 +01:00
modmuss50
9075692951 Added basic ee3 support for all machines, will not work right when it has two outputs 2015-05-30 11:47:01 +01:00
modmuss50
309321dbdc Added powerMultiplier 2015-05-30 11:31:00 +01:00
modmuss50
6185bcd694 added speedMultiplier to the crafter 2015-05-30 11:27:15 +01:00
modmuss50
edabf79b1e Moved all the machines to the new way of handling the packets 2015-05-30 11:14:00 +01:00
modmuss50
0f321e2426 Fixed isactive 2015-05-30 08:53:39 +01:00
Gig
cb541661ad Realigned Nei handler to implosion compressor slots 2015-05-30 02:45:16 +01:00
Gig
83d6613f94 End ore will now only generate in the End 2015-05-30 02:42:43 +01:00
modmuss50
18eed2bf0a fixes #17 2015-05-29 21:54:56 +01:00
modmuss50
7dced713ba Some small changes 2015-05-29 17:13:03 +01:00
modmuss50
c5e73c6fc3 Moved over to the vanilla packet system. 2015-05-29 17:00:17 +01:00