Merge branch '1.20/dev' into 1.20/next

Layers-of-Railways · Aug 14, 2024 · 5e39b2f · 5e39b2f
2 parents a512358 + b4efb49
commit 5e39b2f
Show file tree

Hide file tree

Showing 70 changed files with 0 additions and 0 deletions.
diff --git a/...main/resources/assets/natures_spirit/textures/item/track/track_aspen_narrow.png b/...main/resources/assets/natures_spirit/textures/item/track/track_aspen_narrow.png
diff --git a/...c/main/resources/assets/natures_spirit/textures/item/track/track_aspen_wide.png b/...c/main/resources/assets/natures_spirit/textures/item/track/track_aspen_wide.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_blue_narrow.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_blue_narrow.png
diff --git a/...rc/main/resources/assets/natures_spirit/textures/item/track/track_blue_wide.png b/...rc/main/resources/assets/natures_spirit/textures/item/track/track_blue_wide.png
diff --git a/...in/resources/assets/natures_spirit/textures/item/track/track_cypress_narrow.png b/...in/resources/assets/natures_spirit/textures/item/track/track_cypress_narrow.png
diff --git a/...main/resources/assets/natures_spirit/textures/item/track/track_cypress_wide.png b/...main/resources/assets/natures_spirit/textures/item/track/track_cypress_wide.png
diff --git a/...c/main/resources/assets/natures_spirit/textures/item/track/track_fir_narrow.png b/...c/main/resources/assets/natures_spirit/textures/item/track/track_fir_narrow.png
diff --git a/...src/main/resources/assets/natures_spirit/textures/item/track/track_fir_wide.png b/...src/main/resources/assets/natures_spirit/textures/item/track/track_fir_wide.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_ghaf_narrow.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_ghaf_narrow.png
diff --git a/...rc/main/resources/assets/natures_spirit/textures/item/track/track_ghaf_wide.png b/...rc/main/resources/assets/natures_spirit/textures/item/track/track_ghaf_wide.png
diff --git a/...ain/resources/assets/natures_spirit/textures/item/track/track_joshua_narrow.png b/...ain/resources/assets/natures_spirit/textures/item/track/track_joshua_narrow.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_joshua_wide.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_joshua_wide.png
diff --git a/...main/resources/assets/natures_spirit/textures/item/track/track_maple_narrow.png b/...main/resources/assets/natures_spirit/textures/item/track/track_maple_narrow.png
diff --git a/...c/main/resources/assets/natures_spirit/textures/item/track/track_maple_wide.png b/...c/main/resources/assets/natures_spirit/textures/item/track/track_maple_wide.png
diff --git a/...main/resources/assets/natures_spirit/textures/item/track/track_olive_narrow.png b/...main/resources/assets/natures_spirit/textures/item/track/track_olive_narrow.png
diff --git a/...resources/assets/natures_spirit/textures/item/track/track_olive_pink_narrow.png b/...resources/assets/natures_spirit/textures/item/track/track_olive_pink_narrow.png
diff --git a/...n/resources/assets/natures_spirit/textures/item/track/track_olive_pink_wide.png b/...n/resources/assets/natures_spirit/textures/item/track/track_olive_pink_wide.png
diff --git a/...c/main/resources/assets/natures_spirit/textures/item/track/track_olive_wide.png b/...c/main/resources/assets/natures_spirit/textures/item/track/track_olive_wide.png
diff --git a/...resources/assets/natures_spirit/textures/item/track/track_palo_verde_narrow.png b/...resources/assets/natures_spirit/textures/item/track/track_palo_verde_narrow.png
diff --git a/...n/resources/assets/natures_spirit/textures/item/track/track_palo_verde_wide.png b/...n/resources/assets/natures_spirit/textures/item/track/track_palo_verde_wide.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_pink_narrow.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_pink_narrow.png
diff --git a/...rc/main/resources/assets/natures_spirit/textures/item/track/track_pink_wide.png b/...rc/main/resources/assets/natures_spirit/textures/item/track/track_pink_wide.png
diff --git a/...in/resources/assets/natures_spirit/textures/item/track/track_redwood_narrow.png b/...in/resources/assets/natures_spirit/textures/item/track/track_redwood_narrow.png
diff --git a/...main/resources/assets/natures_spirit/textures/item/track/track_redwood_wide.png b/...main/resources/assets/natures_spirit/textures/item/track/track_redwood_wide.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_sugi_narrow.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_sugi_narrow.png
diff --git a/...rc/main/resources/assets/natures_spirit/textures/item/track/track_sugi_wide.png b/...rc/main/resources/assets/natures_spirit/textures/item/track/track_sugi_wide.png
diff --git a/...ain/resources/assets/natures_spirit/textures/item/track/track_willow_narrow.png b/...ain/resources/assets/natures_spirit/textures/item/track/track_willow_narrow.png
diff --git a/.../main/resources/assets/natures_spirit/textures/item/track/track_willow_wide.png b/.../main/resources/assets/natures_spirit/textures/item/track/track_willow_wide.png
diff --git a/...n/resources/assets/natures_spirit/textures/item/track/track_wisteria_narrow.png b/...n/resources/assets/natures_spirit/textures/item/track/track_wisteria_narrow.png
diff --git a/...ain/resources/assets/natures_spirit/textures/item/track/track_wisteria_wide.png b/...ain/resources/assets/natures_spirit/textures/item/track/track_wisteria_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_acacia_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_acacia_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_acacia_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_acacia_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_ash_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_ash_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_ash_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_ash_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_aspen_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_aspen_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_aspen_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_aspen_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_birch_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_birch_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_birch_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_birch_wide.png
diff --git a/...on/src/main/resources/assets/tfc/textures/item/track/track_blackwood_narrow.png b/...on/src/main/resources/assets/tfc/textures/item/track/track_blackwood_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_blackwood_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_blackwood_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_chestnut_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_chestnut_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_chestnut_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_chestnut_wide.png
diff --git a/.../src/main/resources/assets/tfc/textures/item/track/track_douglas_fir_narrow.png b/.../src/main/resources/assets/tfc/textures/item/track/track_douglas_fir_narrow.png
diff --git a/...on/src/main/resources/assets/tfc/textures/item/track/track_douglas_fir_wide.png b/...on/src/main/resources/assets/tfc/textures/item/track/track_douglas_fir_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_hickory_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_hickory_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_hickory_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_hickory_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_kapok_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_kapok_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_kapok_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_kapok_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_mangrove_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_mangrove_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_mangrove_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_mangrove_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_maple_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_maple_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_maple_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_maple_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_oak_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_oak_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_oak_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_oak_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_palm_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_palm_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_palm_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_palm_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_pine_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_pine_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_pine_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_pine_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_rosewood_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_rosewood_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_rosewood_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_rosewood_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_sequoia_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_sequoia_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_sequoia_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_sequoia_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_spruce_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_spruce_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_spruce_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_spruce_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_sycamore_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_sycamore_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_sycamore_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_sycamore_wide.png
diff --git a/.../src/main/resources/assets/tfc/textures/item/track/track_white_cedar_narrow.png b/.../src/main/resources/assets/tfc/textures/item/track/track_white_cedar_narrow.png
diff --git a/...on/src/main/resources/assets/tfc/textures/item/track/track_white_cedar_wide.png b/...on/src/main/resources/assets/tfc/textures/item/track/track_white_cedar_wide.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_willow_narrow.png b/common/src/main/resources/assets/tfc/textures/item/track/track_willow_narrow.png
diff --git a/common/src/main/resources/assets/tfc/textures/item/track/track_willow_wide.png b/common/src/main/resources/assets/tfc/textures/item/track/track_willow_wide.png