Merge remote-tracking branch 'upstream/master'

someone543 · May 4, 2024 · 3718dc4 · 3718dc4
2 parents 9bcca4a + fa3b881
commit 3718dc4
Show file tree

Hide file tree

Showing 81 changed files with 1,687 additions and 1,206 deletions.
diff --git a/_maps/aetherwhisp.json b/_maps/aetherwhisp.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "SGV Aetherwhisp",
-	"map_link": "Aetherwhisp",
+	"map_link": "aetherwhisp",
     "map_path": "map_files/Aetherwhisp",
     "map_file": ["Aetherwhisp1.dmm", "Aetherwhisp2.dmm"],
 	"traits": [{"Up": 1, "Linkage": "Self"}, {"Down": -1, "Linkage": "Self"}],

diff --git a/_maps/atlas.json b/_maps/atlas.json
@@ -1,6 +1,6 @@
 {
     "map_name": "NSV Atlas",
-    "map_link": "Atlas",
+    "map_link": "atlas",
     "map_path": "map_files/Atlas",
     "map_file": [
         "atlas.dmm",

diff --git a/_maps/eclipse.json b/_maps/eclipse.json
@@ -1,6 +1,6 @@
 {
     "map_name": "NSV Eclipse",
-    "map_link": "Eclipse",
+    "map_link": "eclipse",
     "map_path": "map_files/Eclipse",
     "map_file": ["Eclipse1.dmm", "Eclipse2.dmm"],
 	"traits": [{"Up": 1, "Linkage": "Self"}, {"Down": -1, "Linkage": "Self"}],

diff --git a/_maps/galactica.json b/_maps/galactica.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "NSV Galactica",
-	"map_link": "Galactica",
+	"map_link": "galactica",
 	"map_path": "map_files/Galactica",
 	"map_file": [
 		"Galactica2.dmm",

diff --git a/_maps/gladius.json b/_maps/gladius.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "NSV Gladius",
-	"map_link": "Gladius",
+	"map_link": "gladius",
     "map_path": "map_files/Gladius",
     "map_file": ["Gladius2.dmm", "Gladius1.dmm"],
     "traits": [

diff --git a/_maps/hammerhead.json b/_maps/hammerhead.json
@@ -1,6 +1,6 @@
 {
 	"map_name": "NSV Hammerhead",
-	"map_link": "Hammerhead",
+	"map_link": "hammerhead",
     "map_path": "map_files/Hammerhead",
     "map_file": ["Hammerhead.dmm"],
 	"traits": [{"Linkage": "Self"}],

diff --git a/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm b/_maps/map_files/Aetherwhisp/Aetherwhisp2.dmm
diff --git a/_maps/map_files/Eclipse/Eclipse1.dmm b/_maps/map_files/Eclipse/Eclipse1.dmm