Merge remote-tracking branch 'origin/main'

Author: duplexsystem

.github/workflows/main.yml

@@ -3,10 +3,10 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   validate:
@@ -21,7 +21,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: validate
-    if: github.repository == 'PolyhedralDev/TerraOverworldConfig' && github.event_name == 'push'
+    if: github.repository == 'PolyhedralDev/ReimagEND' && github.event_name == 'push'
 
     env:
       repo_url: ${{ github.server_url }}/${{ github.repository }}

biomes/aether/alternative/betterend/aether_highlands_forest.yml

@@ -1,7 +1,7 @@
 id: AETHER_HIGHLANDS_FOREST
 type: BIOME
 extends: [ AETHER_HIGHLANDS ]
-color: $biomes/colors.yml:AETHER_HIGHLANDS
+color: $biomes/colors.yml:AETHER_HIGHLANDS_FOREST
 vanilla: minecraft:the_end
 
 features:

biomes/colors.yml

@@ -7,24 +7,21 @@ DRAGON_ISLAND_VOID: 0x141414
 # End Biomes
 END_HIGHLANDS: 0xe8e8cf
 HANGING_ISLES: 0xa6a697
-
 SHATTERED_END: 0x180b24
 SHATTERED_FOREST: 0x2f1645
-
 DARK_END: 0x1f1f14
 AMETHYST_END: 0x9966cc
 TAINTED_END: 0x7d08c8
 STYGIAN_BARRENS: 0x252130
-
 CRAGGY_END: 0x929c97
 CHORUVE_WOODS: 0x7f549c
 CHORAL_DEADLANDS: 0x808080
 IVORY_EMPYREAN: 0xffffff
-
 ROSETTE_POOLS: 0xd3658e
 MAUVE_JUNGLE: 0xa92feb
 TWISTED_GROVE: 0x00aba6
 END_WILDS: 0xFFFF00
+MARBLED_LANDSCAPES: 0xbfab75
 CRIM_THICKET: 0x9a596c
 VERMILION_WILDS: 0xb33c35
 
@@ -44,6 +41,26 @@ AETHER_AZURE_MEADOWS: 0x3c79cf
 AETHER_CLARET_GROVE: 0xc24f92
 AETHER_WISPY_ISLES: 0x709fe0
 
+# End Biomes (Desolate Variation)
+END_HIGHLANDS_DESOLATE: 0xe8e8c5
+HANGING_ISLES_DESOLATE: 0xa6a695
+SHATTERED_END_DESOLATE: 0x180b25
+SHATTERED_FOREST_DESOLATE: 0x2f1646
+DARK_END_DESOLATE: 0x1f1f15
+AMETHYST_END_DESOLATE: 0x9966c5
+TAINTED_END_DESOLATE: 0x7d08c5
+STYGIAN_BARRENS_DESOLATE: 0x252135
+CRAGGY_END_DESOLATE: 0x929c95
+CHORUVE_WOODS_DESOLATE: 0x7f5495
+CHORAL_DEADLANDS_DESOLATE: 0x808085
+IVORY_EMPYREAN_DESOLATE: 0xfffff5
+ROSETTE_POOLS_DESOLATE: 0xd36585
+MAUVE_JUNGLE_DESOLATE: 0xa92fe5
+TWISTED_GROVE_DESOLATE: 0x00aba5
+END_WILDS_DESOLATE: 0xFFFF05
+CRIM_THICKET_DESOLATE: 0x9a5965
+VERMILION_WILDS_DESOLATE: 0xb33c36
+
 
 # OLD \/
 

biomes/end/desolate/amethyst_end_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_DEFAULT
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:AMETHYST_END
+color: $biomes/colors.yml:AMETHYST_END_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES

biomes/end/desolate/choral_deadlands_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_DEFAULT
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:CHORAL_DEADLANDS
+color: $biomes/colors.yml:CHORAL_DEADLANDS_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES

biomes/end/desolate/choruve_woods_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_DEFAULT
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:CHORUVE_WOODS
+color: $biomes/colors.yml:CHORUVE_WOODS_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES

biomes/end/desolate/crim_thicket_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_DEFAULT
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:CRIM_THICKET
+color: $biomes/colors.yml:CRIM_THICKET_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES

biomes/end/desolate/dark_end_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_SPIKES
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:DARK_END
+color: $biomes/colors.yml:DARK_END_DESOLATE
 
 particles:
   particle: minecraft:ash

biomes/end/desolate/end_highlands_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_DEFAULT
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:END_HIGHLANDS
+color: $biomes/colors.yml:END_HIGHLANDS_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES

biomes/end/desolate/end_wilds_desolate.yml

@@ -4,7 +4,7 @@ extends:
   - BASE_END
   - EQ_OVERHANGS
 vanilla: minecraft:end_barrens
-color: $biomes/colors.yml:END_WILDS
+color: $biomes/colors.yml:END_WILDS_DESOLATE
 
 tags:
   - ADD_VOID_BIOMES