Commit graph

4239 commits

Author SHA1 Message Date
modmuss50
5b6895c47d tag -> nbt 2019-08-02 14:08:04 +01:00
drcrazy
cae663cc6c More icons in REI 2019-08-02 15:04:03 +03:00
drcrazy
8c0a3b3197 Review of Industrial centrifuge recipes 2019-08-02 11:26:38 +03:00
drcrazy
4c8581ad49 Grinder recipes review 2019-08-02 02:32:34 +03:00
drcrazy
906999f4b4 Compressor recipes reviewed. Couple are missing 2019-08-02 00:33:21 +03:00
drcrazy
0dd2f078ba Fix build and recipe 2019-08-01 21:05:42 +03:00
drcrazy
40755131a4 Even more blocks removed 2019-08-01 20:30:28 +03:00
drcrazy
901a4c106a Separate blocks for Tier1 machines gone 2019-08-01 17:45:59 +03:00
drcrazy
0d9ddc03de Start of machine blocks generalization 2019-08-01 16:33:35 +03:00
drcrazy
255f277304 Should fix armor rendering 2019-08-01 14:34:43 +03:00
Prospector
9eca97e428 Merge remote-tracking branch 'origin/1.14' into 1.14 2019-07-31 21:39:13 -07:00
Prospector
8221be0800 Match sizing to cells 2019-07-31 21:38:47 -07:00
drcrazy
d53779f2c9 Light cleanup 2019-08-01 03:38:55 +03:00
drcrazy
e7adce612e Make TR armor repairable 2019-08-01 03:22:14 +03:00
Prospector
78cbf9a2ac Dynamic bucket textures 2019-07-31 16:13:03 -07:00
modmuss50
779dea4bf8 Enable the buckets again 2019-07-31 20:57:18 +01:00
modmuss50
858adafead Small tweaks + cleanup 2019-07-31 20:50:17 +01:00
modmuss50
70279c1800 More fluid work 2019-07-31 19:37:17 +01:00
modmuss50
739f4c21e8 Fix multiplayer crashes 2019-07-31 17:34:53 +01:00
drcrazy
398d74dedc Implosion Compressor recipes 2019-07-31 17:24:36 +03:00
drcrazy
66a6577dde Inject TR loot into chests 2019-07-31 16:17:59 +03:00
Prospector
35c6c12b72 Remove unnecessary atlas-adding 2019-07-31 00:09:28 -07:00
Prospector
711c95c58e Merge remote-tracking branch 'origin/1.14' into 1.14 2019-07-30 23:35:02 -07:00
Prospector
78b72795c6 Fix cell rendering (blessed Grondag for helping immensely) 2019-07-30 23:34:51 -07:00
drcrazy
5406d08f5d Cleanup and warnings 2019-07-31 02:41:54 +03:00
drcrazy
d1178df673 Ore drop is not working (cry) 2019-07-31 02:13:53 +03:00
Prospector
07db922127 Merge remote-tracking branch 'origin/1.14' into 1.14 2019-07-30 15:26:22 -07:00
Prospector
51ed95008f Add more metadata 2019-07-30 15:26:09 -07:00
modmuss50
a1674cb8a8 More recipes ported 2019-07-30 21:16:44 +01:00
modmuss50
3c29c06d39 Merge remote-tracking branch 'origin/1.14' into 1.14.4 2019-07-30 20:02:57 +01:00
modmuss50
9c9c5f7ac9 A few more recipes 2019-07-30 20:02:40 +01:00
drcrazy
14a78baf5b Initial pass on loot tables for blocks. 2019-07-30 17:13:31 +03:00
modmuss50
dd7ca7dc99 more recipes 2019-07-30 13:05:25 +01:00
modmuss50
9a92325da3 add the mess of the recipe generator code 2019-07-30 12:13:17 +01:00
modmuss50
7e2bf482a2 sawmill recipes 2019-07-30 12:12:56 +01:00
modmuss50
6fc7b7096a auto generated some compressor and grinder recipes 2019-07-30 11:58:07 +01:00
modmuss50
b5d5ef2ca0 Some more recipes 2019-07-30 01:58:41 +01:00
modmuss50
6c0f8afa68 Some grinder recipes 2019-07-30 00:29:50 +01:00
drcrazy
aa7464ad4a Moved recipe utility methods to RecipeUtils 2019-07-30 01:46:12 +03:00
drcrazy
878734e4ad Blast furnace recipes moved to 1.14 2019-07-29 21:24:47 +03:00
modmuss50
aafc42784a Fix Industrial Drill 2019-07-29 16:14:17 +01:00
modmuss50
2308ed0f05 Fix power durability display 2019-07-29 16:02:14 +01:00
modmuss50
5e19889c96 Some hologram changes, the button wont work. 2019-07-29 15:22:48 +01:00
drcrazy
13ed4d1c22 Typo and license 2019-07-29 17:18:52 +03:00
drcrazy
661698593e Some blast furnace recipes 2019-07-29 17:14:34 +03:00
modmuss50
e4c2f1be6d Fix alarm culling and bounding boxes 2019-07-29 14:39:01 +01:00
modmuss50
09662db11a Merge remote-tracking branch 'origin/1.14' into 1.14.4 2019-07-29 14:31:42 +01:00
modmuss50
27207cb498 Expand fluid ingredient to allow limiting to specific fluid holder types 2019-07-29 14:31:21 +01:00
drcrazy
c4a3e5ecf5 Failed attempt to make cell recipe in reactor 2019-07-29 11:25:44 +03:00
drcrazy
213c1b6faa Some chemical reactor recipes 2019-07-29 11:09:37 +03:00