Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

2025-07-11 18:30:02 +01:00 · 2025-07-11 18:30:02 +01:00 · b9741812e9
commit b9741812e9
parent 34a3c594ea c18449d13d
140 changed files with 18 additions and 0 deletions
--- a/.github/images/curseforge_gallery/credit_discord_doctor_rge.png
+++ b/.github/images/curseforge_gallery/credit_discord_doctor_rge.png
--- a/.github/images/curseforge_gallery/credit_discord_doctor_rge_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_doctor_rge_2.png
--- a/.github/images/curseforge_gallery/credit_discord_foresquinn.png
+++ b/.github/images/curseforge_gallery/credit_discord_foresquinn.png
--- a/.github/images/curseforge_gallery/credit_discord_katsuro3.png
+++ b/.github/images/curseforge_gallery/credit_discord_katsuro3.png
--- a/.github/images/curseforge_gallery/credit_discord_mattisso.png
+++ b/.github/images/curseforge_gallery/credit_discord_mattisso.png
--- a/.github/images/curseforge_gallery/credit_discord_mattisso_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_mattisso_2.png
--- a/.github/images/curseforge_gallery/credit_discord_novosibirskat.png
+++ b/.github/images/curseforge_gallery/credit_discord_novosibirskat.png
--- a/.github/images/curseforge_gallery/credit_discord_permarin1.png
+++ b/.github/images/curseforge_gallery/credit_discord_permarin1.png
--- a/.github/images/curseforge_gallery/credit_discord_permarin1_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_permarin1_2.png
--- a/.github/images/curseforge_gallery/credit_discord_permarin1_3.png
+++ b/.github/images/curseforge_gallery/credit_discord_permarin1_3.png
--- a/.github/images/curseforge_gallery/credit_discord_permarin1_4.png
+++ b/.github/images/curseforge_gallery/credit_discord_permarin1_4.png
--- a/.github/images/curseforge_gallery/credit_discord_pyritie.png
+++ b/.github/images/curseforge_gallery/credit_discord_pyritie.png
--- a/.github/images/curseforge_gallery/credit_discord_pyritie_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_pyritie_2.png
--- a/.github/images/curseforge_gallery/credit_discord_pyritie_3.png
+++ b/.github/images/curseforge_gallery/credit_discord_pyritie_3.png
--- a/.github/images/curseforge_gallery/credit_discord_pyritie_4.png
+++ b/.github/images/curseforge_gallery/credit_discord_pyritie_4.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_2.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_3.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_3.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_4.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_4.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_5.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_5.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_6.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_6.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_7.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_7.png
--- a/.github/images/curseforge_gallery/credit_discord_redeix_8.png
+++ b/.github/images/curseforge_gallery/credit_discord_redeix_8.png
--- a/.github/images/curseforge_gallery/credit_discord_spaceharvester.png
+++ b/.github/images/curseforge_gallery/credit_discord_spaceharvester.png
--- a/.github/images/curseforge_gallery/credit_discord_thenimzo.png
+++ b/.github/images/curseforge_gallery/credit_discord_thenimzo.png
--- a/.github/images/curseforge_gallery/credit_discord_thenimzo_2.png
+++ b/.github/images/curseforge_gallery/credit_discord_thenimzo_2.png
--- a/.github/images/curseforge_gallery/credit_discord_vazde.png
+++ b/.github/images/curseforge_gallery/credit_discord_vazde.png
--- a/.github/images/curseforge_gallery/credit_discord_zhumpling.png
+++ b/.github/images/curseforge_gallery/credit_discord_zhumpling.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-Blank_SBG.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-Blank_SBG.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-Blank_SBG_2.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-Blank_SBG_2.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-DrkLgndsLP.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-DrkLgndsLP.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-DrkLgndsLP_2.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-DrkLgndsLP_2.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-Maro919.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-Maro919.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-Maro919_2.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-Maro919_2.png
--- a/.github/images/curseforge_gallery/credit_reddit_u-random_username_idk.png
+++ b/.github/images/curseforge_gallery/credit_reddit_u-random_username_idk.png
--- a/.github/images/curseforge_gallery/credit_tfg_dev_team.png
+++ b/.github/images/curseforge_gallery/credit_tfg_dev_team.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_0.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_0.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_1.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_1.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_2.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_2.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_3.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_3.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_4.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_4.png
--- a/.github/images/panorama_photos/beneath/panorama/panorama_5.png
+++ b/.github/images/panorama_photos/beneath/panorama/panorama_5.png
--- a/.github/images/panorama_photos/beneath/properties.txt
+++ b/.github/images/panorama_photos/beneath/properties.txt
@ -0,0 +1,9 @@
+type = panorama
+
+panorama-meta {
+	name = beneath
+	speed = 1.0
+	fov = 85.0
+	angle = 0.0
+	start_rotation = 20
+}
--- a/.github/images/panorama_photos/moon/moon_panorama.psd
+++ b/.github/images/panorama_photos/moon/moon_panorama.psd
--- a/.github/images/panorama_photos/moon/panorama/panorama_0.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_0.png
--- a/.github/images/panorama_photos/moon/panorama/panorama_1.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_1.png
--- a/.github/images/panorama_photos/moon/panorama/panorama_2.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_2.png
--- a/.github/images/panorama_photos/moon/panorama/panorama_3.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_3.png
--- a/.github/images/panorama_photos/moon/panorama/panorama_4.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_4.png
--- a/.github/images/panorama_photos/moon/panorama/panorama_5.png
+++ b/.github/images/panorama_photos/moon/panorama/panorama_5.png
--- a/.github/images/panorama_photos/moon/properties.txt
+++ b/.github/images/panorama_photos/moon/properties.txt
@ -0,0 +1,9 @@
+type = panorama
+
+panorama-meta {
+	name = moon
+	speed = 1.0
+	fov = 85.0
+	angle = 0.0
+	start_rotation = 20
+}
--- a/.github/images/panorama_photos/moon/unedited/panorama_0.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_0.png
--- a/.github/images/panorama_photos/moon/unedited/panorama_1.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_1.png
--- a/.github/images/panorama_photos/moon/unedited/panorama_2.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_2.png
--- a/.github/images/panorama_photos/moon/unedited/panorama_3.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_3.png
--- a/.github/images/panorama_photos/moon/unedited/panorama_4.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_4.png
--- a/.github/images/panorama_photos/moon/unedited/panorama_5.png
+++ b/.github/images/panorama_photos/moon/unedited/panorama_5.png
--- a/.github/images/slideshow_photos/image_1.png
+++ b/.github/images/slideshow_photos/image_1.png
--- a/.github/images/slideshow_photos/image_10.png
+++ b/.github/images/slideshow_photos/image_10.png
--- a/.github/images/slideshow_photos/image_11.png
+++ b/.github/images/slideshow_photos/image_11.png
--- a/.github/images/slideshow_photos/image_12.png
+++ b/.github/images/slideshow_photos/image_12.png
--- a/.github/images/slideshow_photos/image_13.png
+++ b/.github/images/slideshow_photos/image_13.png
--- a/.github/images/slideshow_photos/image_14.png
+++ b/.github/images/slideshow_photos/image_14.png
--- a/.github/images/slideshow_photos/image_15.png
+++ b/.github/images/slideshow_photos/image_15.png
--- a/.github/images/slideshow_photos/image_16.png
+++ b/.github/images/slideshow_photos/image_16.png
--- a/.github/images/slideshow_photos/image_17.png
+++ b/.github/images/slideshow_photos/image_17.png
--- a/.github/images/slideshow_photos/image_18.png
+++ b/.github/images/slideshow_photos/image_18.png
--- a/.github/images/slideshow_photos/image_2.png
+++ b/.github/images/slideshow_photos/image_2.png
--- a/.github/images/slideshow_photos/image_3.png
+++ b/.github/images/slideshow_photos/image_3.png
--- a/.github/images/slideshow_photos/image_4.png
+++ b/.github/images/slideshow_photos/image_4.png
--- a/.github/images/slideshow_photos/image_5.png
+++ b/.github/images/slideshow_photos/image_5.png
--- a/.github/images/slideshow_photos/image_6.png
+++ b/.github/images/slideshow_photos/image_6.png
--- a/.github/images/slideshow_photos/image_7.png
+++ b/.github/images/slideshow_photos/image_7.png
--- a/.github/images/slideshow_photos/image_8.png
+++ b/.github/images/slideshow_photos/image_8.png
--- a/.github/images/slideshow_photos/image_9.png
+++ b/.github/images/slideshow_photos/image_9.png
--- a/.github/images/slideshow_photos/unedited/image_1.png
+++ b/.github/images/slideshow_photos/unedited/image_1.png
--- a/.github/images/slideshow_photos/unedited/image_10.png
+++ b/.github/images/slideshow_photos/unedited/image_10.png
--- a/.github/images/slideshow_photos/unedited/image_11.png
+++ b/.github/images/slideshow_photos/unedited/image_11.png
--- a/.github/images/slideshow_photos/unedited/image_12.png
+++ b/.github/images/slideshow_photos/unedited/image_12.png
--- a/.github/images/slideshow_photos/unedited/image_13.png
+++ b/.github/images/slideshow_photos/unedited/image_13.png
--- a/.github/images/slideshow_photos/unedited/image_14.png
+++ b/.github/images/slideshow_photos/unedited/image_14.png
--- a/.github/images/slideshow_photos/unedited/image_15.png
+++ b/.github/images/slideshow_photos/unedited/image_15.png
--- a/.github/images/slideshow_photos/unedited/image_16.png
+++ b/.github/images/slideshow_photos/unedited/image_16.png
--- a/.github/images/slideshow_photos/unedited/image_17.png
+++ b/.github/images/slideshow_photos/unedited/image_17.png
--- a/.github/images/slideshow_photos/unedited/image_19.png
+++ b/.github/images/slideshow_photos/unedited/image_19.png
--- a/.github/images/slideshow_photos/unedited/image_2.png
+++ b/.github/images/slideshow_photos/unedited/image_2.png
--- a/.github/images/slideshow_photos/unedited/image_3.png
+++ b/.github/images/slideshow_photos/unedited/image_3.png
--- a/.github/images/slideshow_photos/unedited/image_4.png
+++ b/.github/images/slideshow_photos/unedited/image_4.png
--- a/.github/images/slideshow_photos/unedited/image_5.png
+++ b/.github/images/slideshow_photos/unedited/image_5.png
--- a/.github/images/slideshow_photos/unedited/image_6.png
+++ b/.github/images/slideshow_photos/unedited/image_6.png
--- a/.github/images/slideshow_photos/unedited/image_7.png
+++ b/.github/images/slideshow_photos/unedited/image_7.png
--- a/.github/images/slideshow_photos/unedited/image_8.png
+++ b/.github/images/slideshow_photos/unedited/image_8.png
--- a/.github/images/slideshow_photos/unedited/image_9.png
+++ b/.github/images/slideshow_photos/unedited/image_9.png
--- a/.github/images/unedited/credit_discord_doctor_rge.png
+++ b/.github/images/unedited/credit_discord_doctor_rge.png
--- a/.github/images/unedited/credit_discord_doctor_rge_2.png
+++ b/.github/images/unedited/credit_discord_doctor_rge_2.png
--- a/.github/images/unedited/credit_discord_foresquinn.png
+++ b/.github/images/unedited/credit_discord_foresquinn.png
--- a/.github/images/unedited/credit_discord_katsuro3.png
+++ b/.github/images/unedited/credit_discord_katsuro3.png
--- a/.github/images/unedited/credit_discord_mattisso.png
+++ b/.github/images/unedited/credit_discord_mattisso.png
--- a/.github/images/unedited/credit_discord_mattisso_2.png
+++ b/.github/images/unedited/credit_discord_mattisso_2.png
--- a/.github/images/unedited/credit_discord_novosibirskat.png
+++ b/.github/images/unedited/credit_discord_novosibirskat.png
--- a/Show more
+++ b/Show more