Skip to content

Commit 43de135

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents b395781 + 4949cda commit 43de135

22 files changed

+44
-27
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: CI
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
validate:
@@ -21,7 +21,7 @@ jobs:
2121
release:
2222
runs-on: ubuntu-latest
2323
needs: validate
24-
if: github.repository == 'PolyhedralDev/TerraOverworldConfig' && github.event_name == 'push'
24+
if: github.repository == 'PolyhedralDev/ReimagEND' && github.event_name == 'push'
2525

2626
env:
2727
repo_url: ${{ github.server_url }}/${{ github.repository }}

biomes/aether/alternative/betterend/aether_highlands_forest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
id: AETHER_HIGHLANDS_FOREST
22
type: BIOME
33
extends: [ AETHER_HIGHLANDS ]
4-
color: $biomes/colors.yml:AETHER_HIGHLANDS
4+
color: $biomes/colors.yml:AETHER_HIGHLANDS_FOREST
55
vanilla: minecraft:the_end
66

77
features:

biomes/colors.yml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,21 @@ DRAGON_ISLAND_VOID: 0x141414
77
# End Biomes
88
END_HIGHLANDS: 0xe8e8cf
99
HANGING_ISLES: 0xa6a697
10-
1110
SHATTERED_END: 0x180b24
1211
SHATTERED_FOREST: 0x2f1645
13-
1412
DARK_END: 0x1f1f14
1513
AMETHYST_END: 0x9966cc
1614
TAINTED_END: 0x7d08c8
1715
STYGIAN_BARRENS: 0x252130
18-
1916
CRAGGY_END: 0x929c97
2017
CHORUVE_WOODS: 0x7f549c
2118
CHORAL_DEADLANDS: 0x808080
2219
IVORY_EMPYREAN: 0xffffff
23-
2420
ROSETTE_POOLS: 0xd3658e
2521
MAUVE_JUNGLE: 0xa92feb
2622
TWISTED_GROVE: 0x00aba6
2723
END_WILDS: 0xFFFF00
24+
MARBLED_LANDSCAPES: 0xbfab75
2825
CRIM_THICKET: 0x9a596c
2926
VERMILION_WILDS: 0xb33c35
3027

@@ -44,6 +41,26 @@ AETHER_AZURE_MEADOWS: 0x3c79cf
4441
AETHER_CLARET_GROVE: 0xc24f92
4542
AETHER_WISPY_ISLES: 0x709fe0
4643

44+
# End Biomes (Desolate Variation)
45+
END_HIGHLANDS_DESOLATE: 0xe8e8c5
46+
HANGING_ISLES_DESOLATE: 0xa6a695
47+
SHATTERED_END_DESOLATE: 0x180b25
48+
SHATTERED_FOREST_DESOLATE: 0x2f1646
49+
DARK_END_DESOLATE: 0x1f1f15
50+
AMETHYST_END_DESOLATE: 0x9966c5
51+
TAINTED_END_DESOLATE: 0x7d08c5
52+
STYGIAN_BARRENS_DESOLATE: 0x252135
53+
CRAGGY_END_DESOLATE: 0x929c95
54+
CHORUVE_WOODS_DESOLATE: 0x7f5495
55+
CHORAL_DEADLANDS_DESOLATE: 0x808085
56+
IVORY_EMPYREAN_DESOLATE: 0xfffff5
57+
ROSETTE_POOLS_DESOLATE: 0xd36585
58+
MAUVE_JUNGLE_DESOLATE: 0xa92fe5
59+
TWISTED_GROVE_DESOLATE: 0x00aba5
60+
END_WILDS_DESOLATE: 0xFFFF05
61+
CRIM_THICKET_DESOLATE: 0x9a5965
62+
VERMILION_WILDS_DESOLATE: 0xb33c36
63+
4764

4865
# OLD \/
4966

biomes/end/desolate/amethyst_end_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_DEFAULT
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:AMETHYST_END
7+
color: $biomes/colors.yml:AMETHYST_END_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

biomes/end/desolate/choral_deadlands_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_DEFAULT
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:CHORAL_DEADLANDS
7+
color: $biomes/colors.yml:CHORAL_DEADLANDS_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

biomes/end/desolate/choruve_woods_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_DEFAULT
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:CHORUVE_WOODS
7+
color: $biomes/colors.yml:CHORUVE_WOODS_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

biomes/end/desolate/crim_thicket_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_DEFAULT
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:CRIM_THICKET
7+
color: $biomes/colors.yml:CRIM_THICKET_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

biomes/end/desolate/dark_end_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_SPIKES
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:DARK_END
7+
color: $biomes/colors.yml:DARK_END_DESOLATE
88

99
particles:
1010
particle: minecraft:ash

biomes/end/desolate/end_highlands_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_DEFAULT
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:END_HIGHLANDS
7+
color: $biomes/colors.yml:END_HIGHLANDS_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

biomes/end/desolate/end_wilds_desolate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ extends:
44
- BASE_END
55
- EQ_OVERHANGS
66
vanilla: minecraft:end_barrens
7-
color: $biomes/colors.yml:END_WILDS
7+
color: $biomes/colors.yml:END_WILDS_DESOLATE
88

99
tags:
1010
- ADD_VOID_BIOMES

0 commit comments

Comments
 (0)