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

2725 commits

Author SHA1 Message Date
Ridanis
9d83857dd9 More clean up + updated textures 2024-04-03 18:30:55 +02:00
Ridanis
6bd17fd1ec Snail texture update 2024-04-03 14:17:07 +02:00
Ridanis
a60d11dde0 Lenses + Snail 2024-04-03 13:49:15 +02:00
Ridanis
4721f5128d VoxelShapes + Worm 2024-04-03 12:37:28 +02:00
Ridanis
c0dfed8fa3 Crops 2024-04-03 10:48:40 +02:00
Flanks255
6f56772560 Added Item Tag, to filter by a item tag. 2024-04-02 18:46:52 -05: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
Mrbysco
52b5765a41 Sounds should be mono :) 2024-03-22 01:59:02 +01:00
Flanks255
bfaf90b42c Fixed position of furnace auto split button. 
Fixed rendering of Furnace and Crusher auto split tooltips.
 2024-03-16 17:25:03 -05:00
Flanks255
d9cae5b5f3 ACTUALLY added copper... 2024-03-16 13:08:38 -05:00
Flanks255
6005bee8d2 Added Copper ores to mining lens. 
Added Xycraft ores to mining lens.
 2024-03-16 12:37:17 -05:00
Flanks255
87601c1e6e Fixed removing filters from filterable inventories. 
Added the void sack recipe.
Fixed the void sack.
 2024-03-16 12:25:35 -05:00
Flanks255
44e055499e Try to fix player interface capability invalidation. 2024-03-15 17:30:51 -05:00
Mrbysco
58034533f9 Remove todo from InitVillager since the Engineer villager is back already 2024-03-15 21:17:55 +01:00
Mrbysco
a22ab366b1 Remove initIngredients method since it's been replaced already 2024-03-15 21:06:55 +01:00
Mrbysco
56322ebcc0 Add TODO for coffee saturation 2024-03-15 02:47:12 +01:00
Mrbysco
c2b2cc4d17 Empty the cup 2024-03-15 02:40:07 +01:00
Mrbysco
3b180faf60 Add missing Rotate and Mirror methods to DirectionalBlock 2024-03-14 23:13:11 +01:00
Flanks255
87b0261720 Enabled Handheld filler recipe 
Bumped for FC
 2024-03-14 17:03:44 -05:00
Flanks255
39b20107c4 removed more wips 2024-03-14 16:43:18 -05:00
Flanks255
482fc7acf6 Added some deepslate ores to the lens. 2024-03-14 16:41:45 -05:00
Flanks255
615d1a253e Removed wip from mote items. 2024-03-14 14:53:13 -05:00
Mrbysco
1207a27dbc More patchouli work 2024-03-14 01:53:37 +01:00
Mrbysco
90a923bd08 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-14 00:29:18 +01:00
Mrbysco
ac4d53bde4 Update ItemGrowthRing.java 2024-03-14 00:29:10 +01:00
Flanks255
cad57217d4 Fixed recipe for player interface. 2024-03-13 18:06:38 -05:00
Flanks255
f0184f4d1a Added charged versions of all Energy items to JEI 2024-03-13 17:42:12 -05:00
Flanks255
99ea93ebad Added attachment copying to RecipeKeepDataShaped 2024-03-13 17:05:00 -05:00
Flanks255
911356adbc Fixed mekanism fluorite mining lens entry. 2024-03-13 16:59:01 -05:00
Flanks255
da7de46cdc Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 2024-03-13 16:56:41 -05:00
Flanks255
e0a8eed365 Added RecipeKeepDataShapeless 
Added drill coloring recipes.
 2024-03-13 16:56:22 -05:00
Mrbysco
d2d0afa6d7 Fix the contain checks on the Player Probe and Player Interface 2024-03-13 22:35:43 +01:00
Flanks255
e4e9108099 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 
# Conflicts:
#	src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246
 2024-03-13 15:32:37 -05:00
Flanks255
cf80d1746e Readded rice paper recipe. 2024-03-13 15:32:15 -05:00
Mrbysco
659779b110 Banner patterns 2024-03-13 16:50:01 +01:00
Mrbysco
154add17bd Remove (wip) from drill core 2024-03-13 03:39:01 +01:00
Mrbysco
b94353019c Setup loot modifiers (Numbers need tweaking) 2024-03-13 03:38:20 +01:00
Mrbysco
f390ffd47f Add drill highlighting 2024-03-13 01:50:37 +01:00
Mrbysco
5a1eabeac4 Fix hopping item interface 2024-03-13 01:02:49 +01:00
Mrbysco
26758cb41b Update TileEntityBase.java 2024-03-13 00:30:34 +01:00
Mrbysco
bd392b0a5b Add back directionality to the hopping item interface 2024-03-13 00:28:41 +01:00
Flanks255
b8e284d947 Bandaid on hopping item interface. 
Fixed phantomface capability invalidation.
 2024-03-12 17:43:16 -05:00
Flanks255
f471f4f1fa Added Ancient debris to mining lens. 2024-03-12 17:15:56 -05:00
Mrbysco
f76db7ba65 Remove unused imports 2024-03-12 22:51:28 +01:00
Mrbysco
d64b530f8d Last I18n replacement 2024-03-12 22:39:01 +01:00
Mrbysco
b866f50e8f Add Mining Lens category 2024-03-12 22:21:17 +01:00
Mrbysco
87b4e29534 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 2024-03-12 21:31:32 +01:00
Mrbysco
3a767e1894 Replace more calls to I18n with Component.translatable 
Fix up the Relay item Whitelist GUI
 2024-03-12 21:31:29 +01:00
Flanks255
e1cd1b42ad Added mining lens recipe for Black Quartz ore 
Added mining lens recipes for some other mods ores.
 2024-03-12 14:57:44 -05:00
Mrbysco
d1ceffcac9 Update BlockLaserRelay.java 2024-03-12 20:37:25 +01:00
Mrbysco
0226078aee Use Components for the Laser Relays instead of String using I18n 2024-03-12 20:37:07 +01:00
Mrbysco
08b4f923f2 Use ITEM_WITH_COUNT_CODEC where possible 2024-03-12 20:09:08 +01:00
Flanks255
d1f77f3df2 Added smelting and blasting recipes for Black Quartz Ore 2024-03-12 13:22:30 -05:00
Mrbysco
337fbfb854 Remove renderLaser call from ReconstructorRenderer 
It's handled by the particle
 2024-03-12 18:49:18 +01:00
Mrbysco
58b9cbc9d2 Adjust the laser particle 2024-03-12 18:48:51 +01:00
Mrbysco
c995908d51 Fix the reconstructor death messages 2024-03-12 18:31:30 +01:00
Mrbysco
f5e3736299 Remove WIP from Shock Absorber 2024-03-12 18:21:12 +01:00
Mrbysco
5a921e100f Change Phantom Itemface recipe 2024-03-12 18:00:31 +01:00
Mrbysco
17d8dcce82 Long Range Breaker and Vertical Digger 2024-03-12 18:00:23 +01:00
Mrbysco
8419cc67aa Add Heat Collector recipe and remove (wip) 2024-03-12 17:12:20 +01:00
Mrbysco
8abfa2415e Add Bio Reactor recipe 2024-03-12 17:04:22 +01:00
Mrbysco
5a9f7d9168 Remove WIP from more items and the bio reactor 2024-03-12 17:00:27 +01:00
Mrbysco
c418b867ff Fix empty display name for Feeder 2024-03-12 17:00:12 +01:00
Mrbysco
fc75b13b86 Bio Reactor works :) 2024-03-12 17:00:02 +01:00
Mrbysco
41e85391be Remove wip from Firework Box 2024-03-12 16:49:03 +01:00
Mrbysco
7c7a095cc3 Add Automatic Feeder recipe back 2024-03-12 16:39:36 +01:00
Mrbysco
cef510c8d7 Remove some todo's 2024-03-12 16:35:56 +01:00
Mrbysco
73be71afe5 Automatic Feeder works 2024-03-12 16:35:48 +01:00
Mrbysco
fb80bf33ef Wait... the particle beam renders now? 2024-03-12 02:32:04 +01:00
Flanks255
ae6695a5ba Fixed Phantomfaces. 
Added Recipes for Phantomfaces.
 2024-03-11 17:51:32 -05:00
Mrbysco
ffc67e6a5b Remove unused imports 2024-03-11 22:38:16 +01:00
Mrbysco
9f8523486c Fix up the Water Bowl 2024-03-11 22:38:09 +01:00
Mrbysco
8a16143e2f Remove WIP from blocks/items that work 2024-03-11 22:22:34 +01:00
Mrbysco
1224c1de29 Remove todo from Greenhouse Glass 2024-03-11 22:22:20 +01:00
Mrbysco
5182ac8b92 Leaf-eating Generator done 2024-03-11 22:18:00 +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
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
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
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