Commit graph

4319 commits

Author SHA1 Message Date
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
drcrazy
3b63383012 More on REI 2019-07-29 02:16:43 +03:00
drcrazy
29aeb50d85 Translation for REI recipe categories 2019-07-28 23:39:01 +03:00
modmuss50
b89a52e594 Fluid color in cell changes color based on biome's water color + some other fixes and changes 2019-07-28 17:29:01 +01:00
modmuss50
0da3168bbf Fluid ingredients + some other work around this area 2019-07-28 17:14:38 +01:00
modmuss50
0118d5a999 Refactor machine ingredients 2019-07-28 14:50:06 +01:00
drcrazy
a7de6b428a Cleanups 2019-07-27 01:52:51 +03:00
drcrazy
4e1dfa0018 Translation for solar panels 2019-07-26 15:22:48 +03:00
drcrazy
d76d637781 Fix solar panel loading NPE 2019-07-26 15:12:47 +03:00
drcrazy
f28462a9e6 Alloy smelter recipes 2019-07-26 14:08:03 +03:00
drcrazy
e4b0eff608 Blockstates and models for fluid blocks 2019-07-26 12:41:10 +03:00
drcrazy
f06e1a8673 ModSounds refactored to follow items, blocks and fluids 2019-07-26 11:45:30 +03:00
drcrazy
316def3086 Cables are working 2019-07-26 02:37:02 +03:00
modmuss50
0dc2636046 Final build fixes 2019-07-25 14:35:27 +01:00
modmuss50
7bf0e4f08a Fix build? 2019-07-25 14:16:30 +01:00
drcrazy
cc91888c4a More alloys 2019-07-25 15:59:43 +03:00
drcrazy
80f2440323 Unused imports and Lightning rod 2019-07-25 15:20:57 +03:00
modmuss50
52da17dfd5 Start on REI support, very basic right now, but it will help a lot when adding recipes. 2019-07-25 13:14:46 +01:00
modmuss50
a80d2183f9 Fix iron furnace 2019-07-25 00:16:49 +01:00
modmuss50
fc56eeaf61 Slot config 2019-07-25 00:10:11 +01:00
modmuss50
6a93c3fd46 more misc fluid work, gonna leave most of this untill we have an offical or new api 2019-07-24 19:06:21 +01:00