Commit graph

3024 commits

Author SHA1 Message Date
Flanks255
19afc5f05c Fixed up datagen. 2024-04-09 17:30:53 -05:00
Mrbysco
4aeb9bd34f
Merge pull request #1396 from Ridanisaurus/1.20.4
Retexture 2.1
2024-04-05 18:55:41 +02:00
Ridanis
6542628228 Retextures 2.1 2024-04-04 09:08:52 +02:00
Mrbysco
d95442957e
Merge pull request #1395 from Ridanisaurus/1.20.4
Retextures 2.0
2024-04-03 21:56:17 +02:00
Ridanis
d136820b38 Updated Drill textures 2024-04-03 20:07:13 +02:00
Ridanis
f8fa256b24 Updated Battery textures 2024-04-03 18:56:59 +02:00
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
8104cc4be2 Marking stuff off. 2024-03-16 13:23:04 -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
db3a550070 Bump for FC release. 2024-03-16 12:26:01 -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
44202f9c46 Bump for FC 2024-03-13 17:55:33 -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
Mrbysco
8385c5aea6 2nd client run for testing 2024-03-13 22:35:11 +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