Merge pull request 'Modlist Update 0.6' (#2 ) from mod-devbranch into main

Reviewed-on: https://dagemark.se/git/git/Hannah/SashanationAirbourne/pulls/2
Merge branch 'main' into mod-devbranch
2026-05-09 19:07:12 +00:00 · 2026-05-09 19:06:57 +00:00 · 2026-05-09 20:51:06 +02:00 · 2026-05-09 20:38:52 +02:00 · 2026-05-09 20:34:21 +02:00 · 2026-05-09 20:19:06 +02:00
55 changed files with 5 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,6 @@
 # Client data
 /crash-reports
 /debug
 /local
 /logs
 /saves
@ -31,10 +32,12 @@
 /patchouli_books
 /schematics
 /scripts
 /vista_ffmpeg_bin
 /xaero
 /Xaero*
 /command_history.txt
 /ponders_watched.json
 /patchouli_data.json
 /rhino.local.properties
-
+/vista_ffmpeg_sources.json
--- a/minecraftinstance.json
+++ b/minecraftinstance.json
--- a/mods/Byzantine-1.21.1-50.jar
+++ b/mods/Byzantine-1.21.1-50.jar
--- a/mods/ColonyRank-1.21.1-1.0.1.jar
+++ b/mods/ColonyRank-1.21.1-1.0.1.jar
--- a/mods/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.9.jar
+++ b/mods/CrashAssistant-neoforge-1.20.6-1.21.4-1.11.9.jar
--- a/mods/CreateDragonsPlus-1.10.0b.jar
+++ b/mods/CreateDragonsPlus-1.10.0b.jar
--- a/mods/JadeAddons-1.21.1-NeoForge-6.1.0.jar
+++ b/mods/JadeAddons-1.21.1-NeoForge-6.1.0.jar
--- a/mods/MineColonies_Compatibility-1.21.1-3.42.jar
+++ b/mods/MineColonies_Compatibility-1.21.1-3.42.jar
--- a/mods/MineColonies_Tweaks-1.21.1-3.29.jar
+++ b/mods/MineColonies_Tweaks-1.21.1-3.29.jar
--- a/1.21.1-1.0.2.jar
+++ b/1.21.1-1.0.2.jar
--- a/mods/ToastControl-1.21.1-9.0.1.jar
+++ b/mods/ToastControl-1.21.1-9.0.1.jar
--- a/Survival-1.21.1-neoforge-2.0.1.jar
+++ b/Survival-1.21.1-neoforge-2.0.1.jar
--- a/mods/athena-neoforge-1.21.1-4.0.6.jar
+++ b/mods/athena-neoforge-1.21.1-4.0.6.jar
--- a/mods/biolith-neoforge-3.0.11.jar
+++ b/mods/biolith-neoforge-3.0.11.jar
--- a/mods/chipped-neoforge-1.21.1-4.0.2.jar
+++ b/mods/chipped-neoforge-1.21.1-4.0.2.jar
--- a/mods/chloride-NEOFORGE-mc1.21.1-v1.7.6.jar
+++ b/mods/chloride-NEOFORGE-mc1.21.1-v1.7.6.jar
--- a/mods/cleanswing-1.9.jar
+++ b/mods/cleanswing-1.9.jar
--- a/mods/craftingtweaks-neoforge-1.21.1-21.1.10.jar
+++ b/mods/craftingtweaks-neoforge-1.21.1-21.1.10.jar
--- a/mods/create-enchantment-industry-2.3.1.jar
+++ b/mods/create-enchantment-industry-2.3.1.jar
--- a/mods/create_aeronautics_throwable_rope_connector-0.1.0.jar
+++ b/mods/create_aeronautics_throwable_rope_connector-0.1.0.jar
--- a/mods/create_aeronautics_throwable_rope_connector-0.2.1.jar
+++ b/mods/create_aeronautics_throwable_rope_connector-0.2.1.jar
--- a/mods/create_chipped-1.2.0-neoforge-1.21.1.jar
+++ b/mods/create_chipped-1.2.0-neoforge-1.21.1.jar
--- a/mods/create_connected-1.1.16-mc1.21.1.jar
+++ b/mods/create_connected-1.1.16-mc1.21.1.jar
--- a/mods/create_radar-0.4.8-1.21.1.jar
+++ b/mods/create_radar-0.4.8-1.21.1.jar
--- a/mods/create_train_parts-0.3.6-1.21.1-6.0.9-216.jar
+++ b/mods/create_train_parts-0.3.6-1.21.1-6.0.9-216.jar
--- a/mods/create_train_parts-0.4.0-1.21.1-6.0.9-216.jar
+++ b/mods/create_train_parts-0.4.0-1.21.1-6.0.9-216.jar
--- a/mods/createcobblestone-1.4.9+neoforge-1.21.1-130.jar
+++ b/mods/createcobblestone-1.4.9+neoforge-1.21.1-130.jar
--- a/mods/createpickywheels-neoforge-1.21.1-6.0.9-6.jar
+++ b/mods/createpickywheels-neoforge-1.21.1-6.0.9-6.jar
--- a/mods/createtransmission-1.1.2+neoforge-create6-1.21.1.jar
+++ b/mods/createtransmission-1.1.2+neoforge-create6-1.21.1.jar
--- a/mods/cullleaves-neoforge-4.1.1+1.21.1.jar
+++ b/mods/cullleaves-neoforge-4.1.1+1.21.1.jar
--- a/mods/dynamic-fps-3.11.4+minecraft-1.21.0-neoforge.jar
+++ b/mods/dynamic-fps-3.11.4+minecraft-1.21.0-neoforge.jar
--- a/mods/entityculling-neoforge-1.10.1-mc1.21.1.jar
+++ b/mods/entityculling-neoforge-1.10.1-mc1.21.1.jar
--- a/mods/entityculling-neoforge-1.10.2-mc1.21.1.jar
+++ b/mods/entityculling-neoforge-1.10.2-mc1.21.1.jar
--- a/mods/examplemod-1.0.0.jar
+++ b/mods/examplemod-1.0.0.jar
--- a/mods/fastleafdecay-35.jar
+++ b/mods/fastleafdecay-35.jar
--- a/mods/invtweaks-1.21.1-1.3.2.jar
+++ b/mods/invtweaks-1.21.1-1.3.2.jar
--- a/mods/lithostitched-1.7.3-neoforge-21.1.jar
+++ b/mods/lithostitched-1.7.3-neoforge-21.1.jar
--- a/mods/maxhealthfix-neoforge-1.21.1-21.1.4.jar
+++ b/mods/maxhealthfix-neoforge-1.21.1-21.1.4.jar
--- a/mods/mcjadecrops-1.1.1300.jar
+++ b/mods/mcjadecrops-1.1.1300.jar
--- a/mods/midnightlib-neoforge-1.9.3+1.21.1.jar
+++ b/mods/midnightlib-neoforge-1.9.3+1.21.1.jar
--- a/mods/modelfix-1.21-1.10.jar
+++ b/mods/modelfix-1.21-1.10.jar
--- a/mods/modernfix-neoforge-5.27.7+mc1.21.1.jar
+++ b/mods/modernfix-neoforge-5.27.7+mc1.21.1.jar
--- a/mods/moonlight-neoforge-1.21.1-3.0.6.jar
+++ b/mods/moonlight-neoforge-1.21.1-3.0.6.jar
--- a/mods/moreculling-neoforge-1.21.1-1.0.7.jar
+++ b/mods/moreculling-neoforge-1.21.1-1.0.7.jar
--- a/mods/petrolpark-1.21.1-1.4.34.jar
+++ b/mods/petrolpark-1.21.1-1.4.34.jar
--- a/mods/petrolsparts-1.21.1-1.2.10.jar
+++ b/mods/petrolsparts-1.21.1-1.2.10.jar
--- a/mods/railways-0.2.0-beta.2+neoforge-mc1.21.1.jar
+++ b/mods/railways-0.2.0-beta.2+neoforge-mc1.21.1.jar
--- a/mods/reap-neoforge-1.21.1-1.1.2.jar
+++ b/mods/reap-neoforge-1.21.1-1.1.2.jar
--- a/mods/resourcefullib-neoforge-1.21-3.0.12.jar
+++ b/mods/resourcefullib-neoforge-1.21-3.0.12.jar
--- a/mods/smallcolonies
+++ b/mods/smallcolonies
--- a/mods/sophisticatedcore-1.21.1-1.4.38.1847.jar
+++ b/mods/sophisticatedcore-1.21.1-1.4.38.1847.jar
--- a/mods/tracks-neoforge-1.21.1-1.0.1.jar
+++ b/mods/tracks-neoforge-1.21.1-1.0.1.jar
--- a/mods/vista-neoforge-1.21.1-4.0.0.jar
+++ b/mods/vista-neoforge-1.21.1-4.0.0.jar
--- a/mods/xaerominimap-neoforge-1.21.1-25.3.13.jar
+++ b/mods/xaerominimap-neoforge-1.21.1-25.3.13.jar
--- a/mods/xaeroworldmap-neoforge-1.21.1-1.40.16.jar
+++ b/mods/xaeroworldmap-neoforge-1.21.1-1.40.16.jar
Author	SHA1	Message	Date
Hannah	757650a402	Merge pull request 'Modlist Update 0.6' (#2 ) from mod-devbranch into main Reviewed-on: https://dagemark.se/git/git/Hannah/SashanationAirbourne/pulls/2	2026-05-09 19:07:12 +00:00
Hannah	e812d85c4c	Merge branch 'main' into mod-devbranch	2026-05-09 19:06:57 +00:00
Hannah	908a208e62	Added Create Enchantment Industry and Create Railways	2026-05-09 20:51:06 +02:00
Hannah	df5174d279	Removed create Tracks mod that was causing issue in the server	2026-05-09 20:38:52 +02:00
Hannah	2b93ff06fc	Added minecolonies addonmods	2026-05-09 20:34:21 +02:00
Hannah	312ef3173f	Updated a large set of mods	2026-05-09 20:19:06 +02:00
Hannah	68887c1c1d	Added Vista Exceptions, updated minecraft instance	2026-05-09 20:18:48 +02:00
Hannah	ac9720e2e1	Added QOL mods (Big bundle)	2026-05-09 14:11:15 +02:00
Hannah	e0ae5cd191	Added 4 create addon mods	2026-05-09 14:10:25 +02:00
Hannah	6867dcb84e	Updated PetrolPark Library to Experimental 1.4.33 for new create addonmod compat	2026-05-09 14:10:09 +02:00
Hannah	0cee8ec408	Removed Picky Wheels	2026-05-09 13:56:13 +02:00
Hannah	267df5e1d3	Fix Gitignore, updated instance	2026-05-09 11:14:58 +02:00