Merge pull request #321 from Solaris-Skunk-Werks/release/v0.7.6.1

Release/v0.7.6.1
Solaris-Skunk-Werks · Jan 14, 2024 · 066fb9d · 066fb9d
2 parents 9a1c37f + 382a482
commit 066fb9d
Show file tree

Hide file tree

Showing 94 changed files with 7,020 additions and 10,283 deletions.
diff --git a/.gitignore b/.gitignore
@@ -69,6 +69,13 @@ fabric.properties
 # .idea/misc.xml
 # *.ipr
 
+# Eclipse
+/.metadata/
+.classpath
+.project
+.settings/
+/*/bin
+
 
 ### Gradle ###
 .gradle

diff --git a/Data/Equipment/ammunition.json b/Data/Equipment/ammunition.json
@@ -8935,7 +8935,7 @@
     "ActualName": "Ammo: Fluid Gun (Coolant)",
     "CritName": "@ Fluid Gun (Coolant)",
     "LookupName": "@ Fluid Gun (Coolant)",
-    "MegaMekName": "FluidGunCoolantAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 3000.0,
@@ -9012,7 +9012,7 @@
     "ActualName": "Ammo: Fluid Gun (Corrosive)",
     "CritName": "@ Fluid Gun (Corrosive)",
     "LookupName": "@ Fluid Gun (Corrosive)",
-    "MegaMekName": "FluidGunCorrosiveAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 5000.0,
@@ -9089,7 +9089,7 @@
     "ActualName": "Ammo: Fluid Gun (Flame Retardant Foam)",
     "CritName": "@ Fluid Gun (Flm Rtrdnt)",
     "LookupName": "@ Fluid Gun (Flame Retardant Foam)",
-    "MegaMekName": "FluidGunFoamAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 1000.0,
@@ -9166,7 +9166,7 @@
     "ActualName": "Ammo: Fluid Gun (Inferno Fuel)",
     "CritName": "@ Fluid Gun (Inferno Fuel)",
     "LookupName": "@ Fluid Gun (Inferno Fuel)",
-    "MegaMekName": "FluidGunInfernoFuelAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 2000.0,
@@ -9243,7 +9243,7 @@
     "ActualName": "Ammo: Fluid Gun (Oil Slick)",
     "CritName": "@ Fluid Gun (Oil Slick)",
     "LookupName": "@ Fluid Gun (Oil Slick)",
-    "MegaMekName": "FluidGunOilSlickAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 2000.0,
@@ -9320,7 +9320,7 @@
     "ActualName": "Ammo: Fluid Gun (Paint/Obscurant)",
     "CritName": "@ Fluid Gun (Pnt/Obscrnt)",
     "LookupName": "@ Fluid Gun (Paint/Obscurant)",
-    "MegaMekName": "FluidGunPaintAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 1000.0,
@@ -9397,7 +9397,7 @@
     "ActualName": "Ammo: Fluid Gun (Water)",
     "CritName": "@ Fluid Gun (Water)",
     "LookupName": "@ Fluid Gun (Water)",
-    "MegaMekName": "FluidGunWaterAmmo",
+    "MegaMekName": "ISFluidGun Ammo",
     "BookRef": "Tactical Operations",
     "Tonnage": 1.0,
     "Cost": 500.0,