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
|
2e37a04a2a
|
Bump for FC
|
2024-03-11 17:52:24 -05: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 |
|