Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-16 21:13:11 +01:00
Code Issues Projects Releases Wiki Activity
2925 commits 14 branches 4 tags 33 MiB
Commit graph

2925 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mrbysco
53e4cb8a9b Change FluidDisplay to use the RenderSystem calls instead of GLStateManager where possible 2024-03-09 16:38:17 +01:00
Mrbysco
4a36c696ab Make getOverlayText return a Component in FluidDisplay 2024-03-09 16:36:47 +01:00
Mrbysco
83828a6def Re-enable the text rendering on the energy display 
Make getOverlayText return a Component instead of Component -> getString -> Component.literal
 2024-03-09 16:33:31 +01:00
Mrbysco
f1c7b2491e Change the overlay checked so overlays aren't rendered over the hotbar 2024-03-09 16:31:10 +01:00
Mrbysco
951355bf05 Remove YummyItem which is a unused class for the foods that are removed 
https://github.com/Ellpeck/ActuallyAdditions/blob/1.20.4/port.MD?plain=1#L25
 2024-03-09 16:05:39 +01:00
Mrbysco
f758e8beac Deprecate ActuallyItem and DrillAugmentItem 
They both have replacements and are unused
 2024-03-09 16:03:33 +01:00
Mrbysco
4b55999af3 Remove WIP from Powered Furnace name 2024-03-09 15:46:20 +01:00
Mrbysco
323c07568d Use the level and pos variable 2024-03-09 15:44:35 +01:00
Mrbysco
73f7af4dbf Fix the position of the auto split button in the Powered Furnace UI 2024-03-09 15:34:50 +01:00
Mrbysco
bbf42da613 Remove todo from Powered Furnace light level code (it works) 2024-03-09 15:16:38 +01:00
Mrbysco
817797ad3a Re-enable rendering of the GreenHouse glass and add culling 2024-03-09 02:33:07 +01:00
Flanks255
63719ef06f bumped version 2024-03-08 18:34:58 -06:00
Flanks255
2fbf2984ab More tweaks. 2024-03-08 18:24:19 -06:00
Michael Hillcox
ecb8d46f50 fix: no more bad trace 2024-03-09 00:13:27 +00:00
Flanks255
d1438dd67e Fixed filling wand using wrong method. 2024-03-08 18:13:09 -06:00