Merge branch 'master' into turnover_prisonerLoyalty

MegaMek · Jun 20, 2024 · 3618632 · 3618632
2 parents b304fe4 + 5500117
commit 3618632
Show file tree

Hide file tree

Showing 512 changed files with 37,317 additions and 3,897 deletions.
diff --git a/MekHQ/data/boards/unofficial/Derv_Maps/60x60 Nanking.board b/MekHQ/data/boards/unofficial/Derv_Maps/60x60 Nanking.board
@@ -1766,9 +1766,9 @@ hex 1830 0 "road:1:18" "grass"
 hex 1930 0 "road:1:18" "grass"
 hex 2030 0 "road:1:18" "grass"
 hex 2130 0 "road:1:18" "grass"
-hex 2230 0 "" """
-hex 2330 0 "" """
-hex 2430 0 "" """
+hex 2230 0 "" "grass"
+hex 2330 0 "" "grass"
+hex 2430 0 "" "grass"
 hex 2530 0 "woods:1;foliage_elev:2" "grass"
 hex 2630 0 "woods:1;foliage_elev:2" "grass"
 hex 2730 1 "road:1:36" "grass"
@@ -1824,13 +1824,13 @@ hex 1631 0 "road:1:27" "grass"
 hex 1731 0 "road:1:50" "grass"
 hex 1831 0 "road:1:18" "grass"
 hex 1931 0 "road:1:18" "grass"
-hex 2031 0 "" """
-hex 2131 0 "" """
-hex 2231 0 "" """
-hex 2331 0 "" """
-hex 2431 0 "" """
-hex 2531 0 "" """
-hex 2631 0 "" """
+hex 2031 0 "" "grass"
+hex 2131 0 "" "grass"
+hex 2231 0 "" "grass"
+hex 2331 0 "" "grass"
+hex 2431 0 "" "grass"
+hex 2531 0 "" "grass"
+hex 2631 0 "" "grass"
 hex 2731 0 "woods:1;foliage_elev:2" "grass"
 hex 2831 0 "woods:1;foliage_elev:2" "grass"
 hex 2931 1 "road:1:36" "grass"
@@ -1883,15 +1883,15 @@ hex 1532 0 "road:1:18" "grass"
 hex 1632 0 "road:1:19" "grass"
 hex 1732 0 "road:1:22" "grass"
 hex 1832 0 "road:1:34" "grass"
-hex 1932 0 "" """
-hex 2032 0 "" """
-hex 2132 0 "" """
-hex 2232 0 "" """
-hex 2332 0 "" """
-hex 2432 0 "" """
-hex 2532 0 "" """
-hex 2632 0 "" """
-hex 2732 0 "" """
+hex 1932 0 "" "grass"
+hex 2032 0 "" "grass"
+hex 2132 0 "" "grass"
+hex 2232 0 "" "grass"
+hex 2332 0 "" "grass"
+hex 2432 0 "" "grass"
+hex 2532 0 "" "grass"
+hex 2632 0 "" "grass"
+hex 2732 0 "" "grass"
 hex 2832 0 "" "grass"
 hex 2932 0 "" "grass"
 hex 3032 1 "" "grass"
@@ -1943,15 +1943,15 @@ hex 1533 0 "road:1:18" "grass"
 hex 1633 0 "" "grass"
 hex 1733 0 "" "grass"
 hex 1833 0 "" "grass"
-hex 1933 0 "" """
-hex 2033 0 "" """
-hex 2133 0 "" """
-hex 2233 0 "" """
-hex 2333 0 "" """
-hex 2433 0 "" """
-hex 2533 0 "" """
-hex 2633 0 "" """
-hex 2733 0 "" """
+hex 1933 0 "" "grass"
+hex 2033 0 "" "grass"
+hex 2133 0 "" "grass"
+hex 2233 0 "" "grass"
+hex 2333 0 "" "grass"
+hex 2433 0 "" "grass"
+hex 2533 0 "" "grass"
+hex 2633 0 "" "grass"
+hex 2733 0 "" "grass"
 hex 2833 0 "" "grass"
 hex 2933 0 "" "grass"
 hex 3033 0 "" "grass"
@@ -2003,15 +2003,15 @@ hex 1534 0 "" "grass"
 hex 1634 0 "" "grass"
 hex 1734 0 "" "grass"
 hex 1834 0 "" "grass"
-hex 1934 0 "" """
-hex 2034 0 "" """
-hex 2134 0 "" """
-hex 2234 0 "" """
-hex 2334 0 "" """
-hex 2434 0 "" """
-hex 2534 0 "" """
-hex 2634 0 "" """
-hex 2734 0 "" """
+hex 1934 0 "" "grass"
+hex 2034 0 "" "grass"
+hex 2134 0 "" "grass"
+hex 2234 0 "" "grass"
+hex 2334 0 "" "grass"
+hex 2434 0 "" "grass"
+hex 2534 0 "" "grass"
+hex 2634 0 "" "grass"
+hex 2734 0 "" "grass"
 hex 2834 0 "" "grass"
 hex 2934 0 "" "grass"
 hex 3034 0 "" "grass"
@@ -2063,15 +2063,15 @@ hex 1535 0 "" "grass"
 hex 1635 0 "" "grass"
 hex 1735 0 "" "grass"
 hex 1835 0 "" "grass"
-hex 1935 0 "" """
-hex 2035 0 "" """
-hex 2135 0 "" """
-hex 2235 0 "" """
-hex 2335 0 "" """
-hex 2435 0 "" """
-hex 2535 0 "" """
-hex 2635 0 "" """
-hex 2735 0 "" """
+hex 1935 0 "" "grass"
+hex 2035 0 "" "grass"
+hex 2135 0 "" "grass"
+hex 2235 0 "" "grass"
+hex 2335 0 "" "grass"
+hex 2435 0 "" "grass"
+hex 2535 0 "" "grass"
+hex 2635 0 "" "grass"
+hex 2735 0 "" "grass"
 hex 2835 0 "" "grass"
 hex 2935 0 "" "grass"
 hex 3035 0 "" "grass"
@@ -2123,15 +2123,15 @@ hex 1536 0 "" "grass"
 hex 1636 0 "" "grass"
 hex 1736 0 "" "grass"
 hex 1836 0 "" "grass"
-hex 1936 0 "" """
-hex 2036 0 "" """
-hex 2136 0 "" """
-hex 2236 0 "" """
-hex 2336 0 "" """
-hex 2436 0 "" """
-hex 2536 0 "" """
-hex 2636 0 "" """
-hex 2736 0 "" """
+hex 1936 0 "" "grass"
+hex 2036 0 "" "grass"
+hex 2136 0 "" "grass"
+hex 2236 0 "" "grass"
+hex 2336 0 "" "grass"
+hex 2436 0 "" "grass"
+hex 2536 0 "" "grass"
+hex 2636 0 "" "grass"
+hex 2736 0 "" "grass"
 hex 2836 0 "rough:1" "grass"
 hex 2936 0 "" "grass"
 hex 3036 1 "" "grass"
@@ -2185,11 +2185,11 @@ hex 1737 1 "" "grass"
 hex 1837 1 "" "grass"
 hex 1937 0 "" "grass"
 hex 2037 0 "" "grass"
-hex 2137 0 "" """
-hex 2237 0 "" """
-hex 2337 0 "" """
-hex 2437 0 "" """
-hex 2537 0 "" """
+hex 2137 0 "" "grass"
+hex 2237 0 "" "grass"
+hex 2337 0 "" "grass"
+hex 2437 0 "" "grass"
+hex 2537 0 "" "grass"
 hex 2637 0 "" "grass"
 hex 2737 0 "" "grass"
 hex 2837 0 "" "grass"
@@ -2247,7 +2247,7 @@ hex 1938 0 "" "grass"
 hex 2038 0 "" "grass"
 hex 2138 0 "" "grass"
 hex 2238 0 "" "grass"
-hex 2338 0 "" """
+hex 2338 0 "" "grass"
 hex 2438 0 "" "grass"
 hex 2538 1 "" "grass"
 hex 2638 1 "" "grass"