Commit graph

2940 commits

Author SHA1 Message Date
Ridanis
c0dfed8fa3 Crops 2024-04-03 10:48:40 +02:00
Ridanis
79b2084ea5 Added item_tag texture for Flanks 2024-04-03 01:42:52 +02:00
Ridanis
9cf9601eaa Retexture 2.0 2024-04-03 01:06:40 +02:00
Kal Chikhou
55b6270917
Merge pull request #1 from Ellpeck/1.20.4
Generate black quartz ore below 0 too
2024-03-11 21:41:11 +01:00
Mrbysco
ec4b79ffd8 Generate black quartz ore below 0 too 2024-03-11 21:40:35 +01:00
Flanks255
c4d81aea1b Fixed Crafter on a stick 2024-03-11 14:58:38 -05:00
Mrbysco
2a2f5c6cdc Add the Engineer villager back 2024-03-11 20:48:18 +01:00
Mrbysco
4cc4b40c4b Update Tiny Torch light (Engineers house is quite dark if set to 8) 2024-03-11 19:20:58 +01:00
Mrbysco
523cba5958 Add the Engineers House back 2024-03-11 19:17:59 +01:00
Mrbysco
b3bac386ad Add rotation and mirror code to FullyDirectionalBlock 2024-03-11 19:16:44 +01:00
Mrbysco
62ff6acddb Add progress indicator to the Fermenting Category 2024-03-11 04:21:28 +01:00
Mrbysco
b69847d159 Add back recipe for Energizer and Enervator 2024-03-11 02:13:58 +01:00
Mrbysco
55c345a78d Remove unused imports 2024-03-11 02:10:31 +01:00
Mrbysco
e7e2de68f3 Fix up the Energizer and Enervator 2024-03-11 02:10:19 +01:00
Mrbysco
1bcf01101e Removed old JEI code that has been replaced already 2024-03-11 01:33:37 +01:00
Mrbysco
7bcebe64f9 Add recipe for Crusher and Double Crusher 2024-03-11 01:01:51 +01:00
Mrbysco
ef6e52f8a6 Fix up the Crusher and Double Crusher
Datagen Crushing recipes
2024-03-11 00:55:22 +01:00
Flanks255
2a4e966659 Maybe fixing server crash. 2024-03-10 17:41:48 -05:00
Flanks255
be1bb6632a Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-10 17:16:28 -05:00
Flanks255
acc80f61d1 Bumped for FC 2024-03-10 17:16:16 -05:00
Mrbysco
fff34a3afd Add display name to the FireworkBox BlockEntity 2024-03-10 23:14:28 +01:00
Flanks255
adc276e8b5 Fixed Ranged Collector 2024-03-10 17:10:39 -05:00
Mrbysco
a4cc12d993 Restore XP Solidifier GUI
Remove todo about validating Persistent Data as it's correct
2024-03-10 23:00:18 +01:00
Mrbysco
18ac77022e Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-10 22:20:02 +01:00
Mrbysco
6886aca623 Fix the overlay on the Lava Factory Controller
Datagen the recipe for the casing and controller
2024-03-10 22:20:00 +01:00
Flanks255
5db3506179 Bump for fc 2024-03-10 14:02:32 -05:00
Mrbysco
5c13128acf Add a background to the Firework Box GUI and re-position the sliders 2024-03-10 20:00:09 +01:00
Flanks255
f524eccc01 Fixed recipe conflicts.
Fixed fluid placer wasting fluids.
2024-03-10 13:19:11 -05:00
Mrbysco
50b5209e84 Change fluid display rendering so the texture doesn't get stretched 2024-03-10 16:15:54 +01:00
Mrbysco
e4fdc6d7da Fix Fluid Placer not inheriting the ticking of the Fluid Collector 2024-03-10 15:44:53 +01:00
Mrbysco
fd92ee8514 Setup the Firework box UI 2024-03-10 01:52:32 +01:00
Flanks255
9bc38d2a27 Bumped for FC release. 2024-03-09 16:16:25 -06:00
Flanks255
36be4b9a9f Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-09 16:16:01 -06:00
Mrbysco
a65bd989d5 Remove unused imports 2024-03-09 23:14:52 +01:00
Mrbysco
a678b3e049 Remove unused classes that have replacements
`DrillAugmentItem` `ActuallyItem` have been replaced by `ItemDrillUpgrade` and `ItemBase`
`IActuallyItem` was an empty interface never really used
2024-03-09 23:14:34 +01:00
Flanks255
0632253a3b Added JEI plugin for canola press recipes. 2024-03-09 16:08:34 -06:00
Flanks255
7ae6231a38 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-09 16:07:53 -06:00
Mrbysco
e8df077d70 Add missing Black Quartz block recipes 2024-03-09 22:59:45 +01:00
Mrbysco
1d581fc120 Add block/item tags for the crops/ores 2024-03-09 22:54:41 +01:00
Flanks255
713568d7e2 Fixed reconstructor crash 2024-03-09 15:35:28 -06:00
Flanks255
4876677161 Fixed item models. 2024-03-09 15:16:34 -06:00
Mrbysco
e6c8af19af Add crops to villages 2024-03-09 22:15:49 +01:00
Flanks255
3f356896b7 Greenhouse glass recipe. 2024-03-09 11:41:37 -06:00
Mrbysco
53414c434a Add recipe click area for coffee machine and Powered Furnace 2024-03-09 18:02:33 +01:00
Mrbysco
0a6aa6545b Fix shift-clicking empty cups into coffee machine 2024-03-09 17:55:57 +01:00
Mrbysco
fc20f4a94a Fix the Coffee Maker's tick behavior so it works 2024-03-09 17:51:33 +01:00
Mrbysco
09673dd118 Fix right clicking the coffee maker being wonky 2024-03-09 17:51:11 +01:00
Mrbysco
d4cc7b0737 Fix the coffee effect displaying wrong due to setting the ticksPerSecond to 20 instead of 1 2024-03-09 17:49:20 +01:00
Mrbysco
56402e46eb Fix the coffee effect storing 2024-03-09 17:48:42 +01:00
Mrbysco
ba64232ac1 Fix up FluidDisplay not using the tint color of a fluid 2024-03-09 17:04:07 +01:00