Merge branch 'master' of ssh://github.com/MegaMek/megamek

MegaMek · Dec 16, 2016 · 4ba4ffe · 4ba4ffe
2 parents e0fd4af + 5049af1
commit 4ba4ffe
Show file tree

Hide file tree

Showing 402 changed files with 27,487 additions and 2,121 deletions.
diff --git a/megamek/data/boards/unofficial/SeeM/jungle.board b/megamek/data/boards/unofficial/SeeM/jungle.board
diff --git a/megamek/data/images/units/GunEmplacements/AMS_Turret.png b/megamek/data/images/units/GunEmplacements/AMS_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/AMS_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/AMS_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Bunker.png b/megamek/data/images/units/GunEmplacements/Bunker.png
diff --git a/megamek/data/images/units/GunEmplacements/Calliope_Turret.png b/megamek/data/images/units/GunEmplacements/Calliope_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/Gauss_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Gauss_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Gauss_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/Gauss_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Gauss_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Gauss_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Gauss_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Gauss_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Heavy_Gauss_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Array.png b/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Array.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Heavy_MG_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Laser_AMS_Turret.png b/megamek/data/images/units/GunEmplacements/Laser_AMS_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/Laser_AMS_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Laser_AMS_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Light_Gauss_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Light_MG_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MG_Turret_Array.png b/megamek/data/images/units/GunEmplacements/MG_Turret_Array.png
diff --git a/megamek/data/images/units/GunEmplacements/MG_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MG_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MG_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/MG_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/MG_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MG_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MG_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MG_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MML3_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MML3_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MML3_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MML3_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MML3_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MML3_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MML5_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MML5_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MML5_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MML5_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MML5_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MML5_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MML7_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MML7_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MML7_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MML7_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MML7_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MML7_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MML9_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MML9_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MML9_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MML9_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MML9_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MML9_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo_Dual.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo_Triple.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Apollo_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM10_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MRM10_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo_Dual.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo_Triple.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Apollo_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM20_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MRM20_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo_Dual.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo_Triple.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Apollo_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM30_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MRM30_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo_Dual.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo_Triple.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Apollo_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Single.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/MRM40_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/MRM40_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Single.png b/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/Magshot_Gauss_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/RISC_APDS_Dual.png b/megamek/data/images/units/GunEmplacements/RISC_APDS_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/RISC_APDS_Single.png b/megamek/data/images/units/GunEmplacements/RISC_APDS_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Dual_FCS.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Dual_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Quad_FCS.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Quad_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Single.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Single_FCS.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Single_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM2_Turret_Triple_FCS.png b/megamek/data/images/units/GunEmplacements/SRM2_Turret_Triple_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Dual_FCS.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Dual_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Quad_FCS.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Quad_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Single.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Single_FCS.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Single_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM4_Turret_Triple_FCS.png b/megamek/data/images/units/GunEmplacements/SRM4_Turret_Triple_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Dual_FCS.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Dual_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Quad.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Quad_FCS.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Quad_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Single.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Single_FCS.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Single_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Triple.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/SRM6_Turret_Triple_FCS.png b/megamek/data/images/units/GunEmplacements/SRM6_Turret_Triple_FCS.png
diff --git a/megamek/data/images/units/GunEmplacements/TAG_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/TAG_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/TAG_Turret_Single.png b/megamek/data/images/units/GunEmplacements/TAG_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/TSEMP_Turret_Dual.png b/megamek/data/images/units/GunEmplacements/TSEMP_Turret_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/TSEMP_Turret_Single.png b/megamek/data/images/units/GunEmplacements/TSEMP_Turret_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Dual.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Quad.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Single.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Triple.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_10_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Dual.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Quad.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Single.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Triple.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_15_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Dual.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Single.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Triple.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_quad.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_20_quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Dual.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Dual.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Quad.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Quad.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Single.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Single.png
diff --git a/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Triple.png b/megamek/data/images/units/GunEmplacements/Thunderbolt_Turret_5_Triple.png
diff --git a/megamek/data/images/units/GunEmplacements/VGL_Dual_Turret.png b/megamek/data/images/units/GunEmplacements/VGL_Dual_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/VGL_Quad_Turret.png b/megamek/data/images/units/GunEmplacements/VGL_Quad_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/VGL_Single_Turret.png b/megamek/data/images/units/GunEmplacements/VGL_Single_Turret.png
diff --git a/megamek/data/images/units/GunEmplacements/VGL_Triple_Turret.png b/megamek/data/images/units/GunEmplacements/VGL_Triple_Turret.png
diff --git a/megamek/data/images/units/dropships/Vulture.png b/megamek/data/images/units/dropships/Vulture.png
diff --git a/megamek/data/images/units/mechs/Copperhead CPR-HD-003.png b/megamek/data/images/units/mechs/Copperhead CPR-HD-003.png
diff --git a/megamek/data/images/units/mechs/Flashfire FLS-P4.png b/megamek/data/images/units/mechs/Flashfire FLS-P4.png
diff --git a/megamek/data/images/units/mechs/Flashfire FLS-P5.png b/megamek/data/images/units/mechs/Flashfire FLS-P5.png
diff --git a/megamek/data/images/units/mechs/Flashfire.png b/megamek/data/images/units/mechs/Flashfire.png
diff --git a/megamek/data/images/units/mechs/GRF-1A Griffin.png b/megamek/data/images/units/mechs/GRF-1A Griffin.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-1S.png b/megamek/data/images/units/mechs/Griffin GRF-1S.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-2N.png b/megamek/data/images/units/mechs/Griffin GRF-2N.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-3M.png b/megamek/data/images/units/mechs/Griffin GRF-3M.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-4N.png b/megamek/data/images/units/mechs/Griffin GRF-4N.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-4R.png b/megamek/data/images/units/mechs/Griffin GRF-4R.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-5K.png b/megamek/data/images/units/mechs/Griffin GRF-5K.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-5L.png b/megamek/data/images/units/mechs/Griffin GRF-5L.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-5M.png b/megamek/data/images/units/mechs/Griffin GRF-5M.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-6CS.png b/megamek/data/images/units/mechs/Griffin GRF-6CS.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-6S.png b/megamek/data/images/units/mechs/Griffin GRF-6S.png
diff --git a/megamek/data/images/units/mechs/Griffin GRF-6S2.png b/megamek/data/images/units/mechs/Griffin GRF-6S2.png
diff --git a/megamek/data/images/units/mechs/Griffin.png b/megamek/data/images/units/mechs/Griffin.png
diff --git a/megamek/data/images/units/mechs/Koto KT-P2.png b/megamek/data/images/units/mechs/Koto KT-P2.png
diff --git a/megamek/data/images/units/mechs/Koto KTO-4A.png b/megamek/data/images/units/mechs/Koto KTO-4A.png
diff --git a/megamek/data/images/units/mechs/Koto.png b/megamek/data/images/units/mechs/Koto.png
diff --git a/megamek/data/images/units/mechs/Porcupine PRC-2N.png b/megamek/data/images/units/mechs/Porcupine PRC-2N.png
diff --git a/megamek/data/images/units/mechs/Porcupine.png b/megamek/data/images/units/mechs/Porcupine.png
diff --git a/megamek/data/images/units/mechs/Super-Griffin GRF-2N-X.png b/megamek/data/images/units/mechs/Super-Griffin GRF-2N-X.png
diff --git a/megamek/data/images/units/mechs/Wakazashi.png b/megamek/data/images/units/mechs/Wakazashi.png
diff --git a/megamek/data/images/units/mechs/Warhammer WHM-6D.png b/megamek/data/images/units/mechs/Warhammer WHM-6D.png
diff --git a/megamek/data/images/units/mechs/Warhammer WHM-6K.png b/megamek/data/images/units/mechs/Warhammer WHM-6K.png
diff --git a/megamek/data/images/units/mechs/Warhammer WHM-6L.png b/megamek/data/images/units/mechs/Warhammer WHM-6L.png
diff --git a/megamek/data/images/units/mechs/Warhammer WHM-6R.png b/megamek/data/images/units/mechs/Warhammer WHM-6R.png
diff --git a/megamek/data/images/units/mechs/Warhammer.png b/megamek/data/images/units/mechs/Warhammer.png
diff --git a/megamek/data/images/units/mechs/copperhead.png b/megamek/data/images/units/mechs/copperhead.png
diff --git a/megamek/data/images/units/mechs/flashfire.png b/megamek/data/images/units/mechs/flashfire.png
diff --git a/megamek/data/images/units/mechs/griffin_iic.png b/megamek/data/images/units/mechs/griffin_iic.png
diff --git a/megamek/data/images/units/mechs/koto.png b/megamek/data/images/units/mechs/koto.png
diff --git a/megamek/data/images/units/mechs/porcupine.png b/megamek/data/images/units/mechs/porcupine.png
diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
diff --git a/megamek/data/images/units/unused/units_original/Aegis Heavy Cruiser_original.png b/megamek/data/images/units/unused/units_original/Aegis Heavy Cruiser_original.png
diff --git a/...data/images/units/unused/units_original/Aquilla Transport Jumpship_original.png b/...data/images/units/unused/units_original/Aquilla Transport Jumpship_original.png
diff --git a/...k/data/images/units/unused/units_original/Black Lion Battlecruiser_original.png b/...k/data/images/units/unused/units_original/Black Lion Battlecruiser_original.png
diff --git a/...data/images/units/unused/units_original/Black Lion I-Battlecruiser_original.png b/...data/images/units/unused/units_original/Black Lion I-Battlecruiser_original.png
diff --git a/megamek/data/images/units/unused/units_original/Bonaventure Corvette_original.png b/megamek/data/images/units/unused/units_original/Bonaventure Corvette_original.png
diff --git a/...mek/data/images/units/unused/units_original/Command Van (Standard)_original.png b/...mek/data/images/units/unused/units_original/Command Van (Standard)_original.png
diff --git a/...data/images/units/unused/units_original/Commonwealth Light Cruiser_original.png b/...data/images/units/unused/units_original/Commonwealth Light Cruiser_original.png
diff --git a/megamek/data/images/units/unused/units_original/Cruiser_original.png b/megamek/data/images/units/unused/units_original/Cruiser_original.png
diff --git a/megamek/data/images/units/unused/units_original/Dart Light Cruiser_original.png b/megamek/data/images/units/unused/units_original/Dart Light Cruiser_original.png
diff --git a/...mek/data/images/units/unused/units_original/Defender Battlecruiser_original.png b/...mek/data/images/units/unused/units_original/Defender Battlecruiser_original.png
diff --git a/...a/images/units/unused/units_original/Dreadnought Battleship (2330)_original.png b/...a/images/units/unused/units_original/Dreadnought Battleship (2330)_original.png
diff --git a/megamek/data/images/units/unused/units_original/League Destroyer_original.png b/megamek/data/images/units/unused/units_original/League Destroyer_original.png
diff --git a/megamek/data/images/units/unused/units_original/Monsoon Battleship_original.png b/megamek/data/images/units/unused/units_original/Monsoon Battleship_original.png
diff --git a/megamek/data/images/units/unused/units_original/Narukami Destroyer_original.png b/megamek/data/images/units/unused/units_original/Narukami Destroyer_original.png
diff --git a/megamek/data/images/units/unused/units_original/Quixote Frigate_original.png b/megamek/data/images/units/unused/units_original/Quixote Frigate_original.png
diff --git a/megamek/data/images/units/unused/units_original/Vigilant Corvette_original.png b/megamek/data/images/units/unused/units_original/Vigilant Corvette_original.png
diff --git a/megamek/data/images/units/unused/units_original/Vincent Corvette_original.png b/megamek/data/images/units/unused/units_original/Vincent Corvette_original.png
diff --git a/megamek/data/images/units/unused/units_original/Vulture_original.png b/megamek/data/images/units/unused/units_original/Vulture_original.png
diff --git a/megamek/data/images/units/unused/units_original/Whitestreak Speedboat_original.png b/megamek/data/images/units/unused/units_original/Whitestreak Speedboat_original.png
diff --git a/megamek/data/images/units/unused/units_original/Winchester Cruiser_original.png b/megamek/data/images/units/unused/units_original/Winchester Cruiser_original.png
diff --git a/megamek/data/images/units/unused/units_original/copperhead_003_original.gif b/megamek/data/images/units/unused/units_original/copperhead_003_original.gif
diff --git a/megamek/data/images/units/unused/units_original/copperhead_original.gif b/megamek/data/images/units/unused/units_original/copperhead_original.gif
diff --git a/megamek/data/images/units/unused/units_original/flashfire_original.gif b/megamek/data/images/units/unused/units_original/flashfire_original.gif
diff --git a/megamek/data/images/units/unused/units_original/flashfire_p4_original.gif b/megamek/data/images/units/unused/units_original/flashfire_p4_original.gif
diff --git a/megamek/data/images/units/unused/units_original/flashfire_p5_original.gif b/megamek/data/images/units/unused/units_original/flashfire_p5_original.gif
diff --git a/megamek/data/images/units/unused/units_original/koto_4a_original.gif b/megamek/data/images/units/unused/units_original/koto_4a_original.gif
diff --git a/megamek/data/images/units/unused/units_original/koto_original.gif b/megamek/data/images/units/unused/units_original/koto_original.gif
diff --git a/megamek/data/images/units/unused/units_original/koto_p2_original.gif b/megamek/data/images/units/unused/units_original/koto_p2_original.gif
diff --git a/megamek/data/images/units/unused/units_original/mechs/porcupine_2n_original.png b/megamek/data/images/units/unused/units_original/mechs/porcupine_2n_original.png
diff --git a/megamek/data/images/units/unused/units_original/mechs/porcupine_original.png b/megamek/data/images/units/unused/units_original/mechs/porcupine_original.png
diff --git a/megamek/data/images/units/vehicles/Whitestreak Speedboat.png b/megamek/data/images/units/vehicles/Whitestreak Speedboat.png
diff --git a/megamek/data/images/units/warships/Aegis Heavy Cruiser.png b/megamek/data/images/units/warships/Aegis Heavy Cruiser.png
diff --git a/megamek/data/images/units/warships/Aquilla Transport Jumpship.png b/megamek/data/images/units/warships/Aquilla Transport Jumpship.png
diff --git a/megamek/data/images/units/warships/Black Lion Battlecruiser.png b/megamek/data/images/units/warships/Black Lion Battlecruiser.png
diff --git a/megamek/data/images/units/warships/Black Lion I-Battlecruiser.png b/megamek/data/images/units/warships/Black Lion I-Battlecruiser.png
diff --git a/megamek/data/images/units/warships/Bonaventure Corvette.png b/megamek/data/images/units/warships/Bonaventure Corvette.png
diff --git a/megamek/data/images/units/warships/Commonwealth Light Cruiser.png b/megamek/data/images/units/warships/Commonwealth Light Cruiser.png
diff --git a/megamek/data/images/units/warships/Cruiser.png b/megamek/data/images/units/warships/Cruiser.png
diff --git a/megamek/data/images/units/warships/Dart Light Cruiser.png b/megamek/data/images/units/warships/Dart Light Cruiser.png
diff --git a/megamek/data/images/units/warships/Defender Battlecruiser.png b/megamek/data/images/units/warships/Defender Battlecruiser.png
diff --git a/megamek/data/images/units/warships/Dreadnought Battleship (2330).png b/megamek/data/images/units/warships/Dreadnought Battleship (2330).png
diff --git a/megamek/data/images/units/warships/League Destroyer.png b/megamek/data/images/units/warships/League Destroyer.png
diff --git a/megamek/data/images/units/warships/Monsoon Battleship.png b/megamek/data/images/units/warships/Monsoon Battleship.png
diff --git a/megamek/data/images/units/warships/Narukami Destroyer.png b/megamek/data/images/units/warships/Narukami Destroyer.png
diff --git a/megamek/data/images/units/warships/Quixote Frigate.png b/megamek/data/images/units/warships/Quixote Frigate.png
diff --git a/megamek/data/images/units/warships/Vigilant Corvette.png b/megamek/data/images/units/warships/Vigilant Corvette.png
diff --git a/megamek/data/images/units/warships/Vincent Corvette.png b/megamek/data/images/units/warships/Vincent Corvette.png
diff --git a/megamek/data/images/units/warships/Winchester Cruiser.png b/megamek/data/images/units/warships/Winchester Cruiser.png
diff --git a/megamek/data/images/units/warships/dui_shi_wang.png b/megamek/data/images/units/warships/dui_shi_wang.png
diff --git a/megamek/data/images/units/warships/lola_I.png b/megamek/data/images/units/warships/lola_I.png
diff --git a/megamek/data/images/units/warships/lola_II.png b/megamek/data/images/units/warships/lola_II.png
diff --git a/megamek/data/images/units/warships/lola_III.png b/megamek/data/images/units/warships/lola_III.png
diff --git a/megamek/data/mechfiles/ge/Calliope Turret.blk b/megamek/data/mechfiles/ge/Calliope Turret.blk
diff --git a/megamek/data/mechfiles/ge/Clan ER Large Laser Turret.blk b/megamek/data/mechfiles/ge/Clan ER Large Laser Turret.blk
diff --git a/megamek/data/mechfiles/ge/Clan ER PPC Turret.blk b/megamek/data/mechfiles/ge/Clan ER PPC Turret.blk
diff --git a/megamek/data/mechfiles/ge/Clan LRM Turret.blk b/megamek/data/mechfiles/ge/Clan LRM Turret.blk
diff --git a/megamek/data/mechfiles/ge/Clan SRM Turret.blk b/megamek/data/mechfiles/ge/Clan SRM Turret.blk
diff --git a/megamek/data/mechfiles/ge/Clan Streak SRM Turret.blk b/megamek/data/mechfiles/ge/Clan Streak SRM Turret.blk
diff --git a/...s IV/LRM10 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM10 Turret (Dual) Artemis IV.blk b/...s IV/LRM10 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM10 Turret (Dual) Artemis IV.blk
diff --git a/...s IV/LRM10 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM10 Turret (Quad) Artemis IV.blk b/...s IV/LRM10 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM10 Turret (Quad) Artemis IV.blk
diff --git a/...IV/LRM10 Turret (Triple) w Artemis IV.blk → ...s IV/LRM10 Turret (Triple) Artemis IV.blk b/...IV/LRM10 Turret (Triple) w Artemis IV.blk → ...s IV/LRM10 Turret (Triple) Artemis IV.blk
diff --git a/... Artemis IV/LRM10 Turret w Artemis IV.blk → ... w Artemis IV/LRM10 Turret Artemis IV.blk b/... Artemis IV/LRM10 Turret w Artemis IV.blk → ... w Artemis IV/LRM10 Turret Artemis IV.blk
diff --git a/...s IV/LRM15 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM15 Turret (Dual) Artemis IV.blk b/...s IV/LRM15 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM15 Turret (Dual) Artemis IV.blk
diff --git a/...s IV/LRM15 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM15 Turret (Quad) Artemis IV.blk b/...s IV/LRM15 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM15 Turret (Quad) Artemis IV.blk
diff --git a/...IV/LRM15 Turret (Triple) w Artemis IV.blk → ...s IV/LRM15 Turret (Triple) Artemis IV.blk b/...IV/LRM15 Turret (Triple) w Artemis IV.blk → ...s IV/LRM15 Turret (Triple) Artemis IV.blk
diff --git a/... Artemis IV/LRM15 Turret w Artemis IV.blk → ... w Artemis IV/LRM15 Turret Artemis IV.blk b/... Artemis IV/LRM15 Turret w Artemis IV.blk → ... w Artemis IV/LRM15 Turret Artemis IV.blk
diff --git a/...s IV/LRM20 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM20 Turret (Dual) Artemis IV.blk b/...s IV/LRM20 Turret (Dual) w Artemis IV.blk → ...mis IV/LRM20 Turret (Dual) Artemis IV.blk
diff --git a/...s IV/LRM20 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM20 Turret (Quad) Artemis IV.blk b/...s IV/LRM20 Turret (Quad) w Artemis IV.blk → ...mis IV/LRM20 Turret (Quad) Artemis IV.blk
diff --git a/...IV/LRM20 Turret (Triple) w Artemis IV.blk → ...s IV/LRM20 Turret (Triple) Artemis IV.blk b/...IV/LRM20 Turret (Triple) w Artemis IV.blk → ...s IV/LRM20 Turret (Triple) Artemis IV.blk
diff --git a/... Artemis IV/LRM20 Turret w Artemis IV.blk → ... w Artemis IV/LRM20 Turret Artemis IV.blk b/... Artemis IV/LRM20 Turret w Artemis IV.blk → ... w Artemis IV/LRM20 Turret Artemis IV.blk
diff --git a/...is IV/LRM5 Turret (Dual) w Artemis IV.blk → ...emis IV/LRM5 Turret (Dual) Artemis IV.blk b/...is IV/LRM5 Turret (Dual) w Artemis IV.blk → ...emis IV/LRM5 Turret (Dual) Artemis IV.blk
diff --git a/...is IV/LRM5 Turret (Quad) w Artemis IV.blk → ...emis IV/LRM5 Turret (Quad) Artemis IV.blk b/...is IV/LRM5 Turret (Quad) w Artemis IV.blk → ...emis IV/LRM5 Turret (Quad) Artemis IV.blk
diff --git a/... IV/LRM5 Turret (Triple) w Artemis IV.blk → ...is IV/LRM5 Turret (Triple) Artemis IV.blk b/... IV/LRM5 Turret (Triple) w Artemis IV.blk → ...is IV/LRM5 Turret (Triple) Artemis IV.blk
diff --git a/...w Artemis IV/LRM5 Turret w Artemis IV.blk → ...M w Artemis IV/LRM5 Turret Artemis IV.blk b/...w Artemis IV/LRM5 Turret w Artemis IV.blk → ...M w Artemis IV/LRM5 Turret Artemis IV.blk
diff --git a/...mix V/LRM10 Turret (Dual) w Artemis V.blk → ...temix V/LRM10 Turret (Dual) Artemis V.blk b/...mix V/LRM10 Turret (Dual) w Artemis V.blk → ...temix V/LRM10 Turret (Dual) Artemis V.blk
diff --git a/...mix V/LRM10 Turret (Quad) w Artemis V.blk → ...temix V/LRM10 Turret (Quad) Artemis V.blk b/...mix V/LRM10 Turret (Quad) w Artemis V.blk → ...temix V/LRM10 Turret (Quad) Artemis V.blk
diff --git a/...x V/LRM10 Turret (Triple) w Artemis V.blk → ...mix V/LRM10 Turret (Triple) Artemis V.blk b/...x V/LRM10 Turret (Triple) w Artemis V.blk → ...mix V/LRM10 Turret (Triple) Artemis V.blk
diff --git a/... w Artemix V/LRM10 Turret w Artemis V.blk → ...RM w Artemix V/LRM10 Turret Artemis V.blk b/... w Artemix V/LRM10 Turret w Artemis V.blk → ...RM w Artemix V/LRM10 Turret Artemis V.blk
diff --git a/...mix V/LRM15 Turret (Dual) w Artemis V.blk → ...temix V/LRM15 Turret (Dual) Artemis V.blk b/...mix V/LRM15 Turret (Dual) w Artemis V.blk → ...temix V/LRM15 Turret (Dual) Artemis V.blk
diff --git a/...mix V/LRM15 Turret (Quad) w Artemis V.blk → ...temix V/LRM15 Turret (Quad) Artemis V.blk b/...mix V/LRM15 Turret (Quad) w Artemis V.blk → ...temix V/LRM15 Turret (Quad) Artemis V.blk
diff --git a/...x V/LRM15 Turret (Triple) w Artemis V.blk → ...mix V/LRM15 Turret (Triple) Artemis V.blk b/...x V/LRM15 Turret (Triple) w Artemis V.blk → ...mix V/LRM15 Turret (Triple) Artemis V.blk
diff --git a/... w Artemix V/LRM15 Turret w Artemis V.blk → ...RM w Artemix V/LRM15 Turret Artemis V.blk b/... w Artemix V/LRM15 Turret w Artemis V.blk → ...RM w Artemix V/LRM15 Turret Artemis V.blk
diff --git a/...mix V/LRM20 Turret (Dual) w Artemis V.blk → ...temix V/LRM20 Turret (Dual) Artemis V.blk b/...mix V/LRM20 Turret (Dual) w Artemis V.blk → ...temix V/LRM20 Turret (Dual) Artemis V.blk
diff --git a/...mix V/LRM20 Turret (Quad) w Artemis V.blk → ...temix V/LRM20 Turret (Quad) Artemis V.blk b/...mix V/LRM20 Turret (Quad) w Artemis V.blk → ...temix V/LRM20 Turret (Quad) Artemis V.blk
diff --git a/...x V/LRM20 Turret (Triple) w Artemis V.blk → ...mix V/LRM20 Turret (Triple) Artemis V.blk b/...x V/LRM20 Turret (Triple) w Artemis V.blk → ...mix V/LRM20 Turret (Triple) Artemis V.blk
diff --git a/... w Artemix V/LRM20 Turret w Artemis V.blk → ...RM w Artemix V/LRM20 Turret Artemis V.blk b/... w Artemix V/LRM20 Turret w Artemis V.blk → ...RM w Artemix V/LRM20 Turret Artemis V.blk
diff --git a/...emix V/LRM5 Turret (Dual) w Artemis V.blk → ...rtemix V/LRM5 Turret (Dual) Artemis V.blk b/...emix V/LRM5 Turret (Dual) w Artemis V.blk → ...rtemix V/LRM5 Turret (Dual) Artemis V.blk
diff --git a/...emix V/LRM5 Turret (Quad) w Artemis V.blk → ...rtemix V/LRM5 Turret (Quad) Artemis V.blk b/...emix V/LRM5 Turret (Quad) w Artemis V.blk → ...rtemix V/LRM5 Turret (Quad) Artemis V.blk
diff --git a/...ix V/LRM5 Turret (Triple) w Artemis V.blk → ...emix V/LRM5 Turret (Triple) Artemis V.blk b/...ix V/LRM5 Turret (Triple) w Artemis V.blk → ...emix V/LRM5 Turret (Triple) Artemis V.blk
diff --git a/...M w Artemix V/LRM5 Turret w Artemis V.blk → ...LRM w Artemix V/LRM5 Turret Artemis V.blk b/...M w Artemix V/LRM5 Turret w Artemis V.blk → ...LRM w Artemix V/LRM5 Turret Artemis V.blk
diff --git a/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Dual)+ArtemisIV.blk b/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Dual)+ArtemisIV.blk
@@ -10,7 +10,7 @@ MAM0
 GunEmplacement
 </UnitType>
 <Name>
-SRM2 Turret (w/ Artemis IV)
+SRM/2 Turret (w/ Artemis IV)
 </Name>
 <Model>
 (Dual)

diff --git a/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Quad)+ArtemisIV.blk b/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Quad)+ArtemisIV.blk
@@ -10,7 +10,7 @@ MAM0
 GunEmplacement
 </UnitType>
 <Name>
-SRM2 Turret (w/ Artemis IV)
+SRM/2 Turret (w/ Artemis IV)
 </Name>
 <Model>
 (Quad)

diff --git a/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Single)+ArtemisIV.blk b/megamek/data/mechfiles/ge/Clan/SRM/SRM w Artemis IV/SRM2 Turret (Single)+ArtemisIV.blk
@@ -10,7 +10,7 @@ MAM0
 GunEmplacement
 </UnitType>
 <Name>
-SRM2 Turret (w/ Artemis IV)
+SRM/2 Turret (w/ Artemis IV)
 </Name>
 <Model>
 (Single)