modmuss50
|
089f5500e6
|
removed unneeded debug code
|
2015-06-07 14:27:19 +01:00 |
|
modmuss50
|
3605fa7f66
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-07 14:21:25 +01:00 |
|
modmuss50
|
06c21d2668
|
this was the issue all along
This would be the easy fix to my last commit.
|
2015-06-07 11:11:07 +01:00 |
|
modmuss50
|
efba3f247d
|
added IInventory to all machines
|
2015-06-07 09:38:12 +01:00 |
|
modmuss50
|
1ac6f592f8
|
Fixes #25
|
2015-06-07 09:31:58 +01:00 |
|
modmuss50
|
94803e88f3
|
attempt at fixing the item stack size issue
|
2015-06-07 09:21:37 +01:00 |
|
joflashstudios
|
92af5a1537
|
Fixed Digital Chest texture
|
2015-06-07 01:26:37 -04:00 |
|
joflashstudios
|
123c12ae45
|
Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers.
|
2015-06-07 01:02:45 -04:00 |
|
joflashstudios
|
26e71488dd
|
Revert "Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers."
This reverts commit d9494c31fb.
|
2015-06-07 00:45:15 -04:00 |
|
joflashstudios
|
d9494c31fb
|
Changed QuantumChest, QuantumTank, and DigitalChest to use readability helpers.
|
2015-06-07 00:41:20 -04:00 |
|
joflashstudios
|
9fa01eaee2
|
Added helpers for the rest of the item types
|
2015-06-07 00:36:37 -04:00 |
|
joflashstudios
|
b950105578
|
Created BlockOre helpers to make recipes more readable.
These works the same as the ItemParts helpers from e00ba942f8
|
2015-06-07 00:13:41 -04:00 |
|
joflashstudios
|
e00ba942f8
|
Created ItemParts helpers to make recipes more readable.
This makes recipes easier to both write and understand, because I don't have to wonder what ModItems.parts #8 is, I can just see "dataOrb."
|
2015-06-06 23:52:51 -04:00 |
|
joflashstudios
|
31bf279afe
|
Added QuantumTank, QuantumChest, DigitalChest, and ComputerMonitor recipes
|
2015-06-06 23:39:48 -04:00 |
|
joflashstudios
|
7cfaac1f61
|
Added Digital Chest, Computer Monitor
|
2015-06-06 22:11:13 -04:00 |
|
Gig
|
65bd203791
|
All machines will drop Inventory after they Implement IInventory
|
2015-06-07 00:00:15 +01:00 |
|
Gig
|
03c1556935
|
Clean this b4 people kill me
|
2015-06-06 23:20:30 +01:00 |
|
modmuss50
|
c6dc2e2810
|
Clean up of code
|
2015-06-06 22:51:06 +01:00 |
|
joflashstudios
|
2ed801eeb2
|
Merge branch 'master' of https://github.com/TechReborn/TechReborn
|
2015-06-06 17:36:49 -04:00 |
|
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 |
|
