Version bump to 0.2.4-2
All checks were successful
Actions / Autotagger (push) Successful in 9s
Actions / Build Gunpack (push) Successful in 22s

**This update BREAKS all existing guns!**

Renamed all of the guns in the pack to match their english localization files
This commit is contained in:
Seaswimmer 2024-07-23 19:29:37 -04:00
parent 3d8ad2b5f5
commit a8b8b94298
Signed by: cswimr
GPG key ID: 3813315477F26F82
337 changed files with 478 additions and 463 deletions

View file

@ -162,7 +162,7 @@
}, },
"sound_effects": { "sound_effects": {
"0.0667": { "0.0667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_raise" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_raise"
} }
} }
}, },
@ -293,7 +293,7 @@
}, },
"sound_effects": { "sound_effects": {
"0.0": { "0.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_ubgl_drop_rattle" "effect": "emxarms:emx_artemis/p05_ar_schotel_ubgl_drop_rattle"
} }
} }
}, },
@ -767,19 +767,19 @@
}, },
"sound_effects": { "sound_effects": {
"0.0": { "0.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_raise" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_raise"
}, },
"0.5333": { "0.5333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_ubgl_magout" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_ubgl_magout"
}, },
"0.8667": { "0.8667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_branched_reload_magin" "effect": "emxarms:emx_artemis/p05_ar_schotel_branched_reload_magin"
}, },
"1.18": { "1.18": {
"effect": "emxarms:emx_pmg90/emi_reload_2" "effect": "emxarms:emx_artemis/emi_reload_2"
}, },
"1.3667": { "1.3667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_end" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_end"
} }
} }
}, },
@ -1362,25 +1362,25 @@
}, },
"sound_effects": { "sound_effects": {
"0.0": { "0.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_raise" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_raise"
}, },
"0.0333": { "0.0333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magout" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magout"
}, },
"0.8667": { "0.8667": {
"effect": "tacz:mag_drop_sound/iw8_phys_mag_drop_ar_metal_dirt_04" "effect": "tacz:mag_drop_sound/iw8_phys_mag_drop_ar_metal_dirt_04"
}, },
"1.0": { "1.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin"
}, },
"1.7667": { "1.7667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_charge" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_charge"
}, },
"2.14": { "2.14": {
"effect": "emxarms:emx_pmg90/emi_reload_1" "effect": "emxarms:emx_artemis/emi_reload_1"
}, },
"2.2": { "2.2": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_end" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_end"
} }
} }
}, },
@ -2111,46 +2111,46 @@
}, },
"sound_effects": { "sound_effects": {
"0.0": { "0.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_raise" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_raise"
}, },
"0.47": { "0.47": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback"
}, },
"1.1": { "1.1": {
"effect": "emxarms:emx_pmg90/terg_reload" "effect": "emxarms:emx_artemis/terg_reload"
}, },
"1.97": { "1.97": {
"effect": "emxarms:emx_pmg90/cfreload_1" "effect": "emxarms:emx_artemis/cfreload_1"
}, },
"2.97": { "2.97": {
"effect": "emxarms:emx_pmg90/emi_awp_reload" "effect": "emxarms:emx_artemis/emi_awp_reload"
}, },
"1.4333": { "1.4333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle"
}, },
"2.7": { "2.7": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magout" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magout"
}, },
"3.7667": { "3.7667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin"
}, },
"4.3": { "4.3": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_rotate" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_rotate"
}, },
"4.4667": { "4.4667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_boltback" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_boltback"
}, },
"4.8": { "4.8": {
"effect": "emxarms:emx_pmg90/dmr_mod_2" "effect": "emxarms:emx_artemis/dmr_mod_2"
}, },
"5.6": { "5.6": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_boltclose" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_boltclose"
}, },
"5.63": { "5.63": {
"effect": "emxarms:emx_pmg90/emi_reload_1" "effect": "emxarms:emx_artemis/emi_reload_1"
}, },
"5.7": { "5.7": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_end" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_end"
} }
} }
}, },
@ -3197,49 +3197,49 @@
}, },
"sound_effects": { "sound_effects": {
"0.0": { "0.0": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_raise" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_raise"
}, },
"1.4333": { "1.4333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle"
}, },
"2.7": { "2.7": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magout" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magout"
}, },
"3.6667": { "3.6667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle"
}, },
"4.4": { "4.4": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_charge" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_charge"
}, },
"7.59": { "7.59": {
"effect": "emxarms:emx_pmg90/dmr_mod_1" "effect": "emxarms:emx_artemis/dmr_mod_1"
}, },
"4.7667": { "4.7667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_charge2" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_charge2"
}, },
"4.9333": { "4.9333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback"
}, },
"5.6667": { "5.6667": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltclose" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltclose"
}, },
"6.5": { "6.5": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin"
}, },
"7.0333": { "7.0333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_rotate" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_rotate"
}, },
"7.3": { "7.3": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback2" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback2"
}, },
"7.5": { "7.5": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_handling" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_handling"
}, },
"5.65": { "5.65": {
"effect": "emxarms:emx_pmg90/terg_reload_s" "effect": "emxarms:emx_artemis/terg_reload_s"
}, },
"8.9333": { "8.9333": {
"effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_end" "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_end"
} }
} }
}, },
@ -4080,4 +4080,4 @@
} }
} }
} }
} }

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_pmg90e_geo", "model": "emxarms:gun/emx_apollo_geo",
"texture": "emxarms:gun/uv/emx_pmg90e", "texture": "emxarms:gun/uv/emx_apollo",
"hud": "emxarms:gun/hud/emx_pmg90", "hud": "emxarms:gun/hud/emx_artemis",
"slot": "emxarms:gun/slot/emx_pmg90e", "slot": "emxarms:gun/slot/emx_apollo",
"animation": "emxarms:emx_pmg90", "animation": "emxarms:emx_artemis",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -26,10 +26,10 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_pmg90/emx_pmg90_shoot", "shoot": "emxarms:emx_artemis/emx_artemis_shoot",
"shoot_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", "shoot_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p",
"silence": "emxarms:emx_pmg90/emx_pmg90_shoot", "silence": "emxarms:emx_artemis/emx_artemis_shoot",
"silence_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", "silence_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"head_hit": "tacz:head_hit", "head_hit": "tacz:head_hit",

View file

@ -1,13 +1,13 @@
{ {
"model": "emxarms:gun/emx_rivet_geo", "model": "emxarms:gun/emx_ares_geo",
"texture": "emxarms:gun/uv/emx_rivet", "texture": "emxarms:gun/uv/emx_ares",
// "lod": { // "lod": {
// "model": "tacz:gun/lod/m4a1", // "model": "tacz:gun/lod/m4a1",
// "texture": "tacz:gun/lod/m4a1" // "texture": "tacz:gun/lod/m4a1"
// }, // },
"hud": "emxarms:gun/hud/emx_rivet", "hud": "emxarms:gun/hud/emx_ares",
"slot": "emxarms:gun/slot/emx_rivet", "slot": "emxarms:gun/slot/emx_ares",
"animation": "emxarms:emx_rivet", "animation": "emxarms:emx_ares",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -29,16 +29,16 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_rivet/emx_rivet_shoot", "shoot": "emxarms:emx_ares/emx_ares_shoot",
"shoot_3p": "emxarms:emx_rivet/emx_rivet_shoot_3p", "shoot_3p": "emxarms:emx_ares/emx_ares_shoot_3p",
"reload_empty": "emxarms:emx_rivet/m4a1_reload_empty", "reload_empty": "emxarms:emx_ares/m4a1_reload_empty",
"reload_tactical": "emxarms:emx_rivet/m4a1_reload_tactical", "reload_tactical": "emxarms:emx_ares/m4a1_reload_tactical",
"inspect": "emxarms:emx_rivet/m4a1_inspect", "inspect": "emxarms:emx_ares/m4a1_inspect",
"inspect_empty": "emxarms:emx_rivet/m4a1_inspect_empty", "inspect_empty": "emxarms:emx_ares/m4a1_inspect_empty",
"draw": "emxarms:emx_rivet/m4a1_draw", "draw": "emxarms:emx_ares/m4a1_draw",
"put_away": "emxarms:emx_rivet/m4a1_put_away", "put_away": "emxarms:emx_ares/m4a1_put_away",
"silence": "emxarms:emx_rivet/m4a1_silence", "silence": "emxarms:emx_ares/m4a1_silence",
"silence_3p": "emxarms:emx_rivet/m4a1_silence_3p", "silence_3p": "emxarms:emx_ares/m4a1_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -88,4 +88,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_pmg90_geo", "model": "emxarms:gun/emx_artemis_geo",
"texture": "emxarms:gun/uv/emx_pmg90", "texture": "emxarms:gun/uv/emx_artemis",
"hud": "emxarms:gun/hud/emx_pmg90", "hud": "emxarms:gun/hud/emx_artemis",
"slot": "emxarms:gun/slot/emx_pmg90", "slot": "emxarms:gun/slot/emx_artemis",
"animation": "emxarms:emx_pmg90", "animation": "emxarms:emx_artemis",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -26,10 +26,10 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_pmg90/emx_pmg90_shoot", "shoot": "emxarms:emx_artemis/emx_artemis_shoot",
"shoot_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", "shoot_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p",
"silence": "emxarms:emx_pmg90/emx_pmg90_shoot", "silence": "emxarms:emx_artemis/emx_artemis_shoot",
"silence_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", "silence_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"head_hit": "tacz:head_hit", "head_hit": "tacz:head_hit",

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_umx32_geo", "model": "emxarms:gun/emx_atlas_geo",
"texture": "emxarms:gun/uv/emx_umx32", "texture": "emxarms:gun/uv/emx_atlas",
"hud": "emxarms:gun/hud/emx_umx32", "hud": "emxarms:gun/hud/emx_atlas",
"slot": "emxarms:gun/slot/emx_umx32", "slot": "emxarms:gun/slot/emx_atlas",
"animation": "emxarms:emx_umx32", "animation": "emxarms:emx_atlas",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -25,10 +25,10 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_umx32/umx32_shoot", "shoot": "emxarms:emx_atlas/atlas_shoot",
"shoot_3p": "emxarms:emx_umx32/vector_shoot_3p", "shoot_3p": "emxarms:emx_atlas/vector_shoot_3p",
"silence": "emxarms:emx_umx32/vector_silence", "silence": "emxarms:emx_atlas/vector_silence",
"silence_3p": "emxarms:emx_umx32/vector_silence_3p", "silence_3p": "emxarms:emx_atlas/vector_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -124,4 +124,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -0,0 +1,42 @@
{
"model": "emxarms:gun/emx_boomstick_geo",
"texture": "emxarms:gun/uv/emx_boomstick",
"hud": "emxarms:gun/hud/emx_boomstick",
"slot": "emxarms:gun/slot/emx_boomstick",
"animation": "emxarms:emx_boomstick",
"use_default_animation": "rifle",
"third_person_animation": "default",
"transform": {
"scale": {
"thirdperson": [0.6, 0.6, 0.6],
"ground": [0.6, 0.6, 0.6],
"fixed": [1.2, 1.2, 1.2]
}
},
"muzzle_flash": {
"texture": "emxarms:flash/emx_muzzle_flash",
"scale": 0.85
},
"sounds": {
"reload_empty": "emxarms:emx_boomstick/db_short_reload_empty",
"reload_tactical": "emxarms:emx_boomstick/db_short_reload_tactical",
"inspect": "emxarms:emx_boomstick/db_short_inspect",
"inspect_empty": "emxarms:emx_boomstick/db_short_inspect_empty",
"draw": "emxarms:emx_boomstick/db_short_draw",
"put_away": "emxarms:emx_boomstick/db_short_put_away",
"shoot": "emxarms:emx_boomstick/emx_boomstick",
"shoot_3p": "emxarms:emx_boomstick/emx_boomstick"
},
"offhand_show": {
"pos": [1, 22, 4],
"rotate": [0, 0, 60],
"scale": [0.5, 0.5, 0.5]
},
"hotbar_show": {
"0": {
"pos": [-1, 22, 3],
"rotate": [-180, 0, 120],
"scale": [0.5, 0.5, 0.5]
}
}
}

View file

@ -1,7 +1,7 @@
{ {
"model": "emxarms:gun/emx_chaos_geo", "model": "emxarms:gun/emx_chaos_geo",
"texture": "emxarms:gun/uv/emx_chaos", "texture": "emxarms:gun/uv/emx_chaos",
"hud": "emxarms:gun/hud/emx_pulse", "hud": "emxarms:gun/hud/emx_typhon",
"slot": "emxarms:gun/slot/emx_chaos", "slot": "emxarms:gun/slot/emx_chaos",
"animation": "emxarms:emx_chaos", "animation": "emxarms:emx_chaos",
"use_default_animation": "pistol", "use_default_animation": "pistol",
@ -17,15 +17,15 @@
"scale": 0.4 "scale": 0.4
}, },
"sounds": { "sounds": {
"reload_empty": "emxarms:emx_pulse/glock17_reload_empty", "reload_empty": "emxarms:emx_typhon/glock17_reload_empty",
"reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical",
"inspect": "emxarms:emx_pulse/glock17_inspect", "inspect": "emxarms:emx_typhon/glock17_inspect",
"inspect_empty": "emxarms:emx_pulse/glock17_inspect_empty", "inspect_empty": "emxarms:emx_typhon/glock17_inspect_empty",
"draw": "emxarms:emx_pulse/glock17_draw", "draw": "emxarms:emx_typhon/glock17_draw",
"shoot": "emxarms:emx_pulse/emx_pulse_shoot", "shoot": "emxarms:emx_typhon/emx_typhon_shoot",
"shoot_3p": "emxarms:emx_pulse/emx_pulse_shoot_3p", "shoot_3p": "emxarms:emx_typhon/emx_typhon_shoot_3p",
"silence": "emxarms:emx_pulse/glock17_silence", "silence": "emxarms:emx_typhon/glock17_silence",
"silence_3p": "emxarms:emx_pulse/glock17_silence_3p", "silence_3p": "emxarms:emx_typhon/glock17_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"

View file

@ -0,0 +1,45 @@
{
"model": "emxarms:gun/emx_charon_geo",
"texture": "emxarms:gun/uv/emx_charon",
"hud": "emxarms:gun/hud/emx_charon",
"slot": "emxarms:gun/slot/emx_charon",
"animation": "emxarms:emx_charon",
"use_default_animation": "rifle",
"third_person_animation": "default",
"transform": {
"scale": {
"thirdperson": [0.6, 0.6, 0.6],
"ground": [0.6, 0.6, 0.6],
"fixed": [1.2, 1.2, 1.2]
}
},
"muzzle_flash": {
"texture": "emxarms:flash/emx_muzzle_flash",
"scale": 0.85
},
"sounds": {
"reload_empty": "emxarms:emx_boomstick/db_short_reload_empty",
"reload_tactical": "emxarms:emx_boomstick/db_short_reload_tactical",
"inspect": "emxarms:emx_boomstick/db_short_inspect",
"inspect_empty": "emxarms:emx_boomstick/db_short_inspect_empty",
"draw": "emxarms:emx_boomstick/db_short_draw",
"put_away": "emxarms:emx_boomstick/db_short_put_away",
"shoot": "emxarms:emx_boomstick/emx_charon",
"shoot_3p": "emxarms:emx_boomstick/emx_charon",
"dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1"
},
"offhand_show": {
"pos": [1, 22, 4],
"rotate": [0, 0, 60],
"scale": [0.5, 0.5, 0.5]
},
"hotbar_show": {
"0": {
"pos": [-1, 22, 3],
"rotate": [-180, 0, 120],
"scale": [0.5, 0.5, 0.5]
}
}
}

View file

@ -1,45 +0,0 @@
{
"model": "emxarms:gun/emx_enforcer_geo",
"texture": "emxarms:gun/uv/emx_enforcer",
"hud": "emxarms:gun/hud/emx_enforcer",
"slot": "emxarms:gun/slot/emx_enforcer",
"animation": "emxarms:emx_enforcer",
"use_default_animation": "rifle",
"third_person_animation": "default",
"transform": {
"scale": {
"thirdperson": [0.6, 0.6, 0.6],
"ground": [0.6, 0.6, 0.6],
"fixed": [1.2, 1.2, 1.2]
}
},
"muzzle_flash": {
"texture": "emxarms:flash/emx_muzzle_flash",
"scale": 0.85
},
"sounds": {
"reload_empty": "emxarms:emx_scgraves/db_short_reload_empty",
"reload_tactical": "emxarms:emx_scgraves/db_short_reload_tactical",
"inspect": "emxarms:emx_scgraves/db_short_inspect",
"inspect_empty": "emxarms:emx_scgraves/db_short_inspect_empty",
"draw": "emxarms:emx_scgraves/db_short_draw",
"put_away": "emxarms:emx_scgraves/db_short_put_away",
"shoot": "emxarms:emx_scgraves/emx_enforcer",
"shoot_3p": "emxarms:emx_scgraves/emx_enforcer",
"dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1"
},
"offhand_show": {
"pos": [1, 22, 4],
"rotate": [0, 0, 60],
"scale": [0.5, 0.5, 0.5]
},
"hotbar_show": {
"0": {
"pos": [-1, 22, 3],
"rotate": [-180, 0, 120],
"scale": [0.5, 0.5, 0.5]
}
}
}

View file

@ -1,8 +1,8 @@
{ {
"model": "emxarms:gun/emx_draftsman_geo", "model": "emxarms:gun/emx_helios_geo",
"texture": "emxarms:gun/uv/emx_draftsman", "texture": "emxarms:gun/uv/emx_helios",
"hud": "emxarms:gun/hud/emx_draftsman", "hud": "emxarms:gun/hud/emx_helios",
"slot": "emxarms:gun/slot/emx_draftsman", "slot": "emxarms:gun/slot/emx_helios",
"animation": "emxarms:ak47", "animation": "emxarms:ak47",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
@ -26,16 +26,16 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_draftsman/emx_draftsman_shoot", "shoot": "emxarms:emx_helios/emx_helios_shoot",
"shoot_3p": "emxarms:emx_draftsman/ak47_shoot_3p", "shoot_3p": "emxarms:emx_helios/ak47_shoot_3p",
"reload_empty": "emxarms:emx_draftsman/ak47_reload_empty", "reload_empty": "emxarms:emx_helios/ak47_reload_empty",
"reload_tactical": "emxarms:emx_draftsman/ak47_reload_tactical", "reload_tactical": "emxarms:emx_helios/ak47_reload_tactical",
"inspect": "emxarms:emx_draftsman/ak47_inspect", "inspect": "emxarms:emx_helios/ak47_inspect",
"inspect_empty": "emxarms:emx_draftsman/ak47_inspect_empty", "inspect_empty": "emxarms:emx_helios/ak47_inspect_empty",
"draw": "emxarms:emx_draftsman/ak47_draw", "draw": "emxarms:emx_helios/ak47_draw",
"put_away": "emxarms:emx_draftsman/ak47_put_away", "put_away": "emxarms:emx_helios/ak47_put_away",
"silence": "emxarms:emx_draftsman/ak47_silence", "silence": "emxarms:emx_helios/ak47_silence",
"silence_3p": "emxarms:emx_draftsman/ak47_silence_3p", "silence_3p": "emxarms:emx_helios/ak47_silence_3p",
"dry_fire": "tacz:dry_fire", "dry_fire": "tacz:dry_fire",
"fire_select": "tacz:fire_select", "fire_select": "tacz:fire_select",
"head_hit": "tacz:head_hit", "head_hit": "tacz:head_hit",

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_kund50_geo", "model": "emxarms:gun/emx_kronos_geo",
"texture": "emxarms:gun/uv/emx_kund50", "texture": "emxarms:gun/uv/emx_kronos",
"hud": "emxarms:gun/hud/emx_kund50", "hud": "emxarms:gun/hud/emx_kronos",
"slot": "emxarms:gun/slot/emx_kund50", "slot": "emxarms:gun/slot/emx_kronos",
"animation": "emxarms:emx_kund50", "animation": "emxarms:emx_kronos",
"use_default_animation": "pistol", "use_default_animation": "pistol",
"transform": { "transform": {
"scale": { "scale": {
@ -24,15 +24,15 @@
"scale": 0.8 "scale": 0.8
}, },
"sounds": { "sounds": {
"reload_empty": "emxarms:emx_kund50/deagle_reload_empty", "reload_empty": "emxarms:emx_kronos/deagle_reload_empty",
"reload_tactical": "emxarms:emx_kund50/deagle_reload_tactical", "reload_tactical": "emxarms:emx_kronos/deagle_reload_tactical",
"inspect": "emxarms:emx_kund50/deagle_inspect", "inspect": "emxarms:emx_kronos/deagle_inspect",
"inspect_empty": "emxarms:emx_kund50/deagle_inspect_empty", "inspect_empty": "emxarms:emx_kronos/deagle_inspect_empty",
"draw": "emxarms:emx_kund50/deagle_draw", "draw": "emxarms:emx_kronos/deagle_draw",
"shoot": "emxarms:emx_kund50/emx_kund50_shoot", "shoot": "emxarms:emx_kronos/emx_kronos_shoot",
"shoot_3p": "emxarms:emx_kund50/emx_kund50_shoot_3p", "shoot_3p": "emxarms:emx_kronos/emx_kronos_shoot_3p",
"silence": "emxarms:emx_kund50/deagle_silence", "silence": "emxarms:emx_kronos/deagle_silence",
"silence_3p": "emxarms:emx_kund50/deagle_silence_3p", "silence_3p": "emxarms:emx_kronos/deagle_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -136,4 +136,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,13 +1,13 @@
{ {
"model": "emxarms:gun/emx_kund50ex_geo", "model": "emxarms:gun/emx_kronosex_geo",
"texture": "emxarms:gun/uv/emx_kund50ex", "texture": "emxarms:gun/uv/emx_kronosex",
"lod": { "lod": {
"model": "emxarms:gun/lod/emx_kund50ex_lod", "model": "emxarms:gun/lod/emx_kronosex_lod",
"texture": "emxarms:gun/uv/emx_kund50ex" "texture": "emxarms:gun/uv/emx_kronosex"
}, },
"hud": "emxarms:gun/hud/emx_kund50ex", "hud": "emxarms:gun/hud/emx_kronosex",
"slot": "emxarms:gun/slot/emx_kund50ex", "slot": "emxarms:gun/slot/emx_kronosex",
"animation": "emxarms:emx_kund50ex", "animation": "emxarms:emx_kronosex",
"use_default_animation": "pistol", "use_default_animation": "pistol",
"transform": { "transform": {
"scale": { "scale": {
@ -28,15 +28,15 @@
"scale": 0.8 "scale": 0.8
}, },
"sounds": { "sounds": {
"reload_empty": "emxarms:emx_kund50/deagle_reload_empty", "reload_empty": "emxarms:emx_kronos/deagle_reload_empty",
"reload_tactical": "emxarms:emx_kund50/deagle_reload_tactical", "reload_tactical": "emxarms:emx_kronos/deagle_reload_tactical",
"inspect": "emxarms:emx_kund50/deagle_inspect", "inspect": "emxarms:emx_kronos/deagle_inspect",
"inspect_empty": "emxarms:emx_kund50/deagle_inspect_empty", "inspect_empty": "emxarms:emx_kronos/deagle_inspect_empty",
"draw": "emxarms:emx_kund50/deagle_draw", "draw": "emxarms:emx_kronos/deagle_draw",
"shoot": "emxarms:emx_kund50/emx_kund50_shoot", "shoot": "emxarms:emx_kronos/emx_kronos_shoot",
"shoot_3p": "emxarms:emx_kund50/emx_kund50_shoot_3p", "shoot_3p": "emxarms:emx_kronos/emx_kronos_shoot_3p",
"silence": "emxarms:emx_kund50/deagle_silence", "silence": "emxarms:emx_kronos/deagle_silence",
"silence_3p": "emxarms:emx_kund50/deagle_silence_3p", "silence_3p": "emxarms:emx_kronos/deagle_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"

View file

@ -1,13 +1,13 @@
{ {
"model": "emxarms:gun/emx_mg90_geo", "model": "emxarms:gun/emx_posideon_geo",
"texture": "emxarms:gun/uv/emx_mg90", "texture": "emxarms:gun/uv/emx_posideon",
// "lod": { // "lod": {
// "model": "tacz:gun/lod/m4a1", // "model": "tacz:gun/lod/m4a1",
// "texture": "tacz:gun/lod/m4a1" // "texture": "tacz:gun/lod/m4a1"
// }, // },
"hud": "emxarms:gun/hud/emx_mg90", "hud": "emxarms:gun/hud/emx_posideon",
"slot": "emxarms:gun/slot/emx_mg90", "slot": "emxarms:gun/slot/emx_posideon",
"animation": "emxarms:emx_mg90", "animation": "emxarms:emx_posideon",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -29,14 +29,14 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_mg90/nomad_shoot8", "shoot": "emxarms:emx_posideon/nomad_shoot8",
"shoot_3p": "emxarms:emx_mg90/emx_mg90_shoot", "shoot_3p": "emxarms:emx_posideon/emx_posideon_shoot",
"silence": "emxarms:emx_mg90/aa12_silence", "silence": "emxarms:emx_posideon/aa12_silence",
"silence_3p": "emxarms:emx_mg90/aa12_silence_3p", "silence_3p": "emxarms:emx_posideon/aa12_silence_3p",
"reload_empty": "emxarms:emx_mg90/emx_mg90_reload_empty", "reload_empty": "emxarms:emx_posideon/emx_posideon_reload_empty",
"reload_tactical": "emxarms:emx_mg90/emx_mg90_reload_tactical", "reload_tactical": "emxarms:emx_posideon/emx_posideon_reload_tactical",
"draw": "emxarms:emx_mg90/aa12_draw", "draw": "emxarms:emx_posideon/aa12_draw",
"put_away": "emxarms:emx_mg90/aa12_put_away", "put_away": "emxarms:emx_posideon/aa12_put_away",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -116,4 +116,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_umx57_geo", "model": "emxarms:gun/emx_prometheus_geo",
"texture": "emxarms:gun/uv/emx_umx57", "texture": "emxarms:gun/uv/emx_prometheus",
"hud": "emxarms:gun/hud/emx_umx57", "hud": "emxarms:gun/hud/emx_prometheus",
"slot": "emxarms:gun/slot/emx_umx57", "slot": "emxarms:gun/slot/emx_prometheus",
"animation": "emxarms:emx_umx57", "animation": "emxarms:emx_prometheus",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -25,10 +25,10 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_umx32/emx_umx57", "shoot": "emxarms:emx_atlas/emx_prometheus",
"shoot_3p": "emxarms:emx_umx32/vector_shoot_3p", "shoot_3p": "emxarms:emx_atlas/vector_shoot_3p",
"silence": "emxarms:emx_umx32/vector_silence", "silence": "emxarms:emx_atlas/vector_silence",
"silence_3p": "emxarms:emx_umx32/vector_silence_3p", "silence_3p": "emxarms:emx_atlas/vector_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -124,4 +124,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,42 +0,0 @@
{
"model": "emxarms:gun/emx_scgraves_geo",
"texture": "emxarms:gun/uv/emx_scgraves",
"hud": "emxarms:gun/hud/emx_scgraves",
"slot": "emxarms:gun/slot/emx_scgraves",
"animation": "emxarms:emx_scgraves",
"use_default_animation": "rifle",
"third_person_animation": "default",
"transform": {
"scale": {
"thirdperson": [0.6, 0.6, 0.6],
"ground": [0.6, 0.6, 0.6],
"fixed": [1.2, 1.2, 1.2]
}
},
"muzzle_flash": {
"texture": "emxarms:flash/emx_muzzle_flash",
"scale": 0.85
},
"sounds": {
"reload_empty": "emxarms:emx_scgraves/db_short_reload_empty",
"reload_tactical": "emxarms:emx_scgraves/db_short_reload_tactical",
"inspect": "emxarms:emx_scgraves/db_short_inspect",
"inspect_empty": "emxarms:emx_scgraves/db_short_inspect_empty",
"draw": "emxarms:emx_scgraves/db_short_draw",
"put_away": "emxarms:emx_scgraves/db_short_put_away",
"shoot": "emxarms:emx_scgraves/emx_scgraves",
"shoot_3p": "emxarms:emx_scgraves/emx_scgraves"
},
"offhand_show": {
"pos": [1, 22, 4],
"rotate": [0, 0, 60],
"scale": [0.5, 0.5, 0.5]
},
"hotbar_show": {
"0": {
"pos": [-1, 22, 3],
"rotate": [-180, 0, 120],
"scale": [0.5, 0.5, 0.5]
}
}
}

View file

@ -1,8 +1,8 @@
{ {
"model": "emxarms:gun/emx_pulse_geo", "model": "emxarms:gun/emx_typhon_geo",
"texture": "emxarms:gun/uv/emx_pulse", "texture": "emxarms:gun/uv/emx_typhon",
"hud": "emxarms:gun/hud/emx_pulse", "hud": "emxarms:gun/hud/emx_typhon",
"slot": "emxarms:gun/slot/emx_pulse", "slot": "emxarms:gun/slot/emx_typhon",
"animation": "tacz:glock_17", "animation": "tacz:glock_17",
"use_default_animation": "pistol", "use_default_animation": "pistol",
"transform": { "transform": {
@ -17,15 +17,15 @@
"scale": 0.4 "scale": 0.4
}, },
"sounds": { "sounds": {
"reload_empty": "emxarms:emx_pulse/glock17_reload_empty", "reload_empty": "emxarms:emx_typhon/glock17_reload_empty",
"reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical",
"inspect": "emxarms:emx_pulse/glock17_inspect", "inspect": "emxarms:emx_typhon/glock17_inspect",
"inspect_empty": "emxarms:emx_pulse/glock17_inspect_empty", "inspect_empty": "emxarms:emx_typhon/glock17_inspect_empty",
"draw": "emxarms:emx_pulse/glock17_draw", "draw": "emxarms:emx_typhon/glock17_draw",
"shoot": "emxarms:emx_pulse/emx_pulse_shoot", "shoot": "emxarms:emx_typhon/emx_typhon_shoot",
"shoot_3p": "emxarms:emx_pulse/emx_pulse_shoot_3p", "shoot_3p": "emxarms:emx_typhon/emx_typhon_shoot_3p",
"silence": "emxarms:emx_pulse/glock17_silence", "silence": "emxarms:emx_typhon/glock17_silence",
"silence_3p": "emxarms:emx_pulse/glock17_silence_3p", "silence_3p": "emxarms:emx_typhon/glock17_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -105,4 +105,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,9 +1,9 @@
{ {
"model": "emxarms:gun/emx_pulsex2_geo", "model": "emxarms:gun/emx_typhonx2_geo",
"texture": "emxarms:gun/uv/emx_pulsex2", "texture": "emxarms:gun/uv/emx_typhonx2",
"hud": "emxarms:gun/hud/emx_pulsex2", "hud": "emxarms:gun/hud/emx_typhonx2",
"slot": "emxarms:gun/slot/emx_pulsex2", "slot": "emxarms:gun/slot/emx_typhonx2",
"animation": "emxarms:emx_pulsex2_geo", "animation": "emxarms:emx_typhonx2_geo",
"use_default_animation": "pistol", "use_default_animation": "pistol",
"transform": { "transform": {
"scale": { "scale": {
@ -17,15 +17,15 @@
"scale": 0.4 "scale": 0.4
}, },
"sounds": { "sounds": {
"reload_empty": "emxarms:emx_pulse/glock17_reload_empty", "reload_empty": "emxarms:emx_typhon/glock17_reload_empty",
"reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical",
"inspect": "emxarms:emx_pulse/se_inspect", "inspect": "emxarms:emx_typhon/se_inspect",
"inspect_empty": "emxarms:emx_pulse/se_inspect_empty", "inspect_empty": "emxarms:emx_typhon/se_inspect_empty",
"draw": "emxarms:emx_pulse/glock17_draw", "draw": "emxarms:emx_typhon/glock17_draw",
"shoot": "emxarms:emx_pulse/emx_pulsex2", "shoot": "emxarms:emx_typhon/emx_typhonx2",
"shoot_3p": "emxarms:emx_pulse/emx_pulsex2_3p", "shoot_3p": "emxarms:emx_typhon/emx_typhonx2_3p",
"silence": "emxarms:emx_pulse/glock17_silence", "silence": "emxarms:emx_typhon/glock17_silence",
"silence_3p": "emxarms:emx_pulse/glock17_silence_3p", "silence_3p": "emxarms:emx_typhon/glock17_silence_3p",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -105,4 +105,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,13 +1,13 @@
{ {
"model": "emxarms:gun/emx_mg57_geo", "model": "emxarms:gun/emx_zeus_geo",
"texture": "emxarms:gun/uv/emx_mg57", "texture": "emxarms:gun/uv/emx_zeus",
// "lod": { // "lod": {
// "model": "tacz:gun/lod/m4a1", // "model": "tacz:gun/lod/m4a1",
// "texture": "tacz:gun/lod/m4a1" // "texture": "tacz:gun/lod/m4a1"
// }, // },
"hud": "emxarms:gun/hud/emx_mg57", "hud": "emxarms:gun/hud/emx_zeus",
"slot": "emxarms:gun/slot/emx_mg57", "slot": "emxarms:gun/slot/emx_zeus",
"animation": "emxarms:emx_mg57", "animation": "emxarms:emx_zeus",
"use_default_animation": "rifle", "use_default_animation": "rifle",
"third_person_animation": "default", "third_person_animation": "default",
"transform": { "transform": {
@ -29,14 +29,14 @@
"living_time": 1.0 "living_time": 1.0
}, },
"sounds": { "sounds": {
"shoot": "emxarms:emx_mg90/s09_shoot", "shoot": "emxarms:emx_posideon/s09_shoot",
"shoot_3p": "emxarms:emx_mg90/emx_mg90_shoot", "shoot_3p": "emxarms:emx_posideon/emx_posideon_shoot",
"silence": "emxarms:emx_mg90/aa12_silence", "silence": "emxarms:emx_posideon/aa12_silence",
"silence_3p": "emxarms:emx_mg90/aa12_silence_3p", "silence_3p": "emxarms:emx_posideon/aa12_silence_3p",
"reload_empty": "emxarms:emx_mg90/emx_mg90_reload_empty", "reload_empty": "emxarms:emx_posideon/emx_posideon_reload_empty",
"reload_tactical": "emxarms:emx_mg90/emx_mg90_reload_tactical", "reload_tactical": "emxarms:emx_posideon/emx_posideon_reload_tactical",
"draw": "emxarms:emx_mg90/aa12_draw", "draw": "emxarms:emx_posideon/aa12_draw",
"put_away": "emxarms:emx_mg90/aa12_put_away", "put_away": "emxarms:emx_posideon/aa12_put_away",
"dry_fire": "emxarms:emx_dw", "dry_fire": "emxarms:emx_dw",
"fire_select": "emxarms:emx_mode", "fire_select": "emxarms:emx_mode",
"kill": "emxarms:emx_hit1" "kill": "emxarms:emx_hit1"
@ -116,4 +116,4 @@
"scale": [0.5, 0.5, 0.5] "scale": [0.5, 0.5, 0.5]
} }
} }
} }

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_pmg90e.name", "name": "emxarms.gun.emx_apollo.name",
// //
"display": "emxarms:emx_pmg90e_display", "display": "emxarms:emx_apollo_display",
// //
"data": "emxarms:emx_pmg90e_data", "data": "emxarms:emx_apollo_data",
// //
"type": "rpg" "type": "rpg"
} }

View file

@ -0,0 +1,7 @@
{
"name": "emxarms.gun.emx_ares.name",
"display": "emxarms:emx_ares_display",
"data": "emxarms:emx_ares_data",
"type": "rifle",
"sort": 2
}

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_pmg90.name", "name": "emxarms.gun.emx_artemis.name",
// //
"display": "emxarms:emx_pmg90_display", "display": "emxarms:emx_artemis_display",
// //
"data": "emxarms:emx_pmg90_data", "data": "emxarms:emx_artemis_data",
// //
"type": "sniper" "type": "sniper"
} }

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_umx32.name", "name": "emxarms.gun.emx_atlas.name",
// //
"display": "emxarms:emx_umx32_display", "display": "emxarms:emx_atlas_display",
// //
"data": "emxarms:emx_umx32_data", "data": "emxarms:emx_atlas_data",
// //
"type": "smg" "type": "smg"
} }

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_scgraves.name", "name": "emxarms.gun.emx_boomstick.name",
// //
"display": "emxarms:emx_scgraves_display", "display": "emxarms:emx_boomstick_display",
// //
"data": "emxarms:emx_scgraves_data", "data": "emxarms:emx_boomstick_data",
// //
"type": "shotgun" "type": "shotgun"
} }

View file

@ -0,0 +1,6 @@
{
"name": "emxarms.gun.emx_charon.name",
"display": "emxarms:emx_charon_display",
"data": "emxarms:emx_charon_data",
"type": "shotgun"
}

View file

@ -1,6 +0,0 @@
{
"name": "emxarms.gun.emx_enforcer.name",
"display": "emxarms:emx_enforcer_display",
"data": "emxarms:emx_enforcer_data",
"type": "shotgun"
}

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_draftsman.name", "name": "emxarms.gun.emx_helios.name",
// //
"display": "emxarms:emx_draftsman_display", "display": "emxarms:emx_helios_display",
// //
"data": "emxarms:emx_draftsman_data", "data": "emxarms:emx_helios_data",
// //
"type": "shotgun", "type": "shotgun",
// modern_kinetic () // modern_kinetic ()
@ -12,4 +12,4 @@
// //
// //
"sort": 10 "sort": 10
} }

View file

@ -0,0 +1,6 @@
{
"name": "emxarms.gun.emx_kronos.name",
"display": "emxarms:emx_kronos_display",
"data": "emxarms:emx_kronos_data",
"type": "pistol"
}

View file

@ -0,0 +1,7 @@
{
"name": "emxarms.gun.emx_kronosex.name",
"display": "emxarms:emx_kronosex_display",
"tooltip": "emxarms.gun.emx_kronosex.desc",
"data": "emxarms:emx_kronosex_data",
"type": "pistol"
}

View file

@ -1,6 +0,0 @@
{
"name": "emxarms.gun.emx_kund50.name",
"display": "emxarms:emx_kund50_display",
"data": "emxarms:emx_kund50_data",
"type": "pistol"
}

View file

@ -1,7 +0,0 @@
{
"name": "emxarms.gun.emx_kund50ex.name",
"display": "emxarms:emx_kund50ex_display",
"tooltip": "emxarms.gun.emx_kund50ex.desc",
"data": "emxarms:emx_kund50ex_data",
"type": "pistol"
}

View file

@ -1,7 +0,0 @@
{
"name": "emxarms.gun.emx_mg57.name",
"display": "emxarms:emx_mg57_display",
"data": "emxarms:emx_mg57_data",
"type": "mg",
"sort": 2
}

View file

@ -1,7 +0,0 @@
{
"name": "emxarms.gun.emx_mg90.name",
"display": "emxarms:emx_mg90_display",
"data": "emxarms:emx_mg90_data",
"type": "mg",
"sort": 2
}

View file

@ -0,0 +1,7 @@
{
"name": "emxarms.gun.emx_posideon.name",
"display": "emxarms:emx_posideon_display",
"data": "emxarms:emx_posideon_data",
"type": "mg",
"sort": 2
}

View file

@ -1,10 +1,10 @@
{ {
// //
"name": "emxarms.gun.emx_umx57.name", "name": "emxarms.gun.emx_prometheus.name",
// //
"display": "emxarms:emx_umx57_display", "display": "emxarms:emx_prometheus_display",
// //
"data": "emxarms:emx_umx57_data", "data": "emxarms:emx_prometheus_data",
// //
"type": "rifle" "type": "rifle"
} }

View file

@ -1,6 +0,0 @@
{
"name": "emxarms.gun.emx_pulse.name",
"display": "emxarms:emx_pulse_display",
"data": "emxarms:emx_pulse_data",
"type": "pistol"
}

View file

@ -1,6 +0,0 @@
{
"name": "emxarms.gun.emx_pulsex2.name",
"display": "emxarms:emx_pulsex2_display",
"data": "emxarms:emx_pulsex2_data",
"type": "pistol"
}

View file

@ -1,7 +0,0 @@
{
"name": "emxarms.gun.emx_rivet.name",
"display": "emxarms:emx_rivet_display",
"data": "emxarms:emx_rivet_data",
"type": "rifle",
"sort": 2
}

View file

@ -0,0 +1,6 @@
{
"name": "emxarms.gun.emx_typhon.name",
"display": "emxarms:emx_typhon_display",
"data": "emxarms:emx_typhon_data",
"type": "pistol"
}

View file

@ -0,0 +1,6 @@
{
"name": "emxarms.gun.emx_typhonx2.name",
"display": "emxarms:emx_typhonx2_display",
"data": "emxarms:emx_typhonx2_data",
"type": "pistol"
}

View file

@ -0,0 +1,7 @@
{
"name": "emxarms.gun.emx_zeus.name",
"display": "emxarms:emx_zeus_display",
"data": "emxarms:emx_zeus_data",
"type": "mg",
"sort": 2
}

View file

@ -3,21 +3,21 @@
"pack.tacz.emx_arms_gun.desc": "§aElectro§cmagnetic §dArsenal\n§9Galactic§1Factory §8Edition", "pack.tacz.emx_arms_gun.desc": "§aElectro§cmagnetic §dArsenal\n§9Galactic§1Factory §8Edition",
"emxarms.gun.emx_rivet.name": "§aSK-217 “Ares”", "emxarms.gun.emx_ares.name": "§aSK-217 “Ares”",
"emxarms.gun.emx_pulse.name": "§aXSP-31 “Typhon”", "emxarms.gun.emx_typhon.name": "§aXSP-31 “Typhon”",
"emxarms.gun.emx_chaos.name": "§dXSM-31 “Chaos”", "emxarms.gun.emx_chaos.name": "§dXSM-31 “Chaos”",
"emxarms.gun.emx_pulsex2.name": "§aXSP-31-X2 “Typhon”", "emxarms.gun.emx_typhonx2.name": "§aXSP-31-X2 “Typhon”",
"emxarms.gun.emx_draftsman.name": "§aSAIG-24 “Helios”", "emxarms.gun.emx_helios.name": "§aSAIG-24 “Helios”",
"emxarms.gun.emx_kund50.name": "§aMACH-50 “Kronos”", "emxarms.gun.emx_kronos.name": "§aMACH-50 “Kronos”",
"emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “Kronos”", "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “Kronos”",
"emxarms.gun.emx_pmg90.name": "§aHAER-90 “Artemis”", "emxarms.gun.emx_artemis.name": "§aHAER-90 “Artemis”",
"emxarms.gun.emx_pmg90e.name" : "§cHAER-90-E “Apollo”", "emxarms.gun.emx_apollo.name" : "§cHAER-90-E “Apollo”",
"emxarms.gun.emx_umx32.name": "§aVXM-31 “Atlas”", "emxarms.gun.emx_atlas.name": "§aVXM-31 “Atlas”",
"emxarms.gun.emx_umx57.name": "§aVXM-57 “Prometheus”", "emxarms.gun.emx_prometheus.name": "§aVXM-57 “Prometheus”",
"emxarms.gun.emx_scgraves.name": "§aRevolutionary Boomstick", "emxarms.gun.emx_boomstick.name": "§aRevolutionary Boomstick",
"emxarms.gun.emx_mg90.name": "§aAPM-130 “Posideon”", "emxarms.gun.emx_posideon.name": "§aAPM-130 “Posideon”",
"emxarms.gun.emx_mg57.name": "§aHCMG-57 “Zeus”", "emxarms.gun.emx_zeus.name": "§aHCMG-57 “Zeus”",
"emxarms.gun.emx_enforcer.name": "§aDBS-16 “Charon”", "emxarms.gun.emx_charon.name": "§aDBS-16 “Charon”",
"emxarms.ammo.410x57ap.name": "§a4.10x57 AP Cartridge", "emxarms.ammo.410x57ap.name": "§a4.10x57 AP Cartridge",
"emxarms.ammo.339x57.name": "§a3.39x57 M.S. Cartridge", "emxarms.ammo.339x57.name": "§a3.39x57 M.S. Cartridge",
@ -27,14 +27,14 @@
"emxarms.ammo.1045x103-E.name": "§c10.45x103 M.S. High Explosive Flechette", "emxarms.ammo.1045x103-E.name": "§c10.45x103 M.S. High Explosive Flechette",
"emxarms.attachment.sight_emx_demo2.name": "§a“Volt” Holographic Sight", "emxarms.attachment.sight_emx_demo2.name": "§a“Volt” Holographic Sight",
"emxarms.attachment.sight_emx_demo2.tooltip": "The holographic sight that comes standard on the §aSK-217 Apollo§7.", "emxarms.attachment.sight_emx_demo2.tooltip": "The holographic sight that comes standard on the §aSK-217 Ares§7.",
"emxarms.attachment.sight_emx_array.name": "§a“Hermes” Array Vision Scope", "emxarms.attachment.sight_emx_array.name": "§a“Hermes” Array Vision Scope",
"emxarms.attachment.sight_emx_array.tooltip": "An advanced scope design that allows for three levels of magnification.", "emxarms.attachment.sight_emx_array.tooltip": "An advanced scope design that allows for three levels of magnification.",
"emxarms.attachment.sight_emx_char1.name": "§a“Hyperion” Holographic Sight", "emxarms.attachment.sight_emx_char1.name": "§a“Hyperion” Holographic Sight",
"emxarms.attachment.sight_emx_char1.tooltip": "A simple but sleek option for low magnification requirements.", "emxarms.attachment.sight_emx_char1.tooltip": "A simple but sleek option for low magnification requirements.",
"emxarms.attachment.sight_emx_char2.name": "§a“Theia” Holographic Sight", "emxarms.attachment.sight_emx_char2.name": "§a“Theia” Holographic Sight",
"emxarms.attachment.sight_emx_char2.tooltip": "A variation of the §aHyperion§7, with a slightly different design offering higher magnification.", "emxarms.attachment.sight_emx_char2.tooltip": "A variation of the §aHyperion§7, with a slightly different design offering higher magnification.",
"emxarms.attachment.sight_emx_tanh.name": "§a“Ares” Combination Sight", "emxarms.attachment.sight_emx_tanh.name": "§a“Oblivion” Combination Sight",
"emxarms.attachment.sight_emx_tanh.tooltip": "The standard combination sight that comes standard on the §aHAER-90 Artemis §7and §cHAER-90-E Apollo.", "emxarms.attachment.sight_emx_tanh.tooltip": "The standard combination sight that comes standard on the §aHAER-90 Artemis §7and §cHAER-90-E Apollo.",
"emxarms.attachment.sight_emx_integer.name": "§a“Hestia” Holographic Sight", "emxarms.attachment.sight_emx_integer.name": "§a“Hestia” Holographic Sight",
"emxarms.attachment.sight_emx_integer.tooltip": "A wide open sight, which allows for a clearer sight picture.", "emxarms.attachment.sight_emx_integer.tooltip": "A wide open sight, which allows for a clearer sight picture.",

View file

@ -3,25 +3,25 @@
"pack.tacz.emx_arms_gun.desc": "于绝境中凋亡,在逆境中重生。", "pack.tacz.emx_arms_gun.desc": "于绝境中凋亡,在逆境中重生。",
"emxarms.gun.emx_rivet.name": "§aSK-217 “坚钉”", "emxarms.gun.emx_ares.name": "§aSK-217 “坚钉”",
"emxarms.gun.emx_pulse.name": "§aXSP-31 “脉冲”", "emxarms.gun.emx_typhon.name": "§aXSP-31 “脉冲”",
"emxarms.gun.emx_pulsex2.name": "§aXSP-31 “非法殉道者”§f(整活)", "emxarms.gun.emx_typhonx2.name": "§aXSP-31 “非法殉道者”§f(整活)",
"emxarms.gun.emx_draftsman.name": "§aSAIG-24 “绘图师”", "emxarms.gun.emx_helios.name": "§aSAIG-24 “绘图师”",
"emxarms.gun.emx_kund50.name": "§aMACH-50 “极地猎手”", "emxarms.gun.emx_kronos.name": "§aMACH-50 “极地猎手”",
"emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “极地探索者”", "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “极地探索者”",
"emxarms.gun.emx_pmg90.name": "§aHAER-90 “巡弋者”", "emxarms.gun.emx_artemis.name": "§aHAER-90 “巡弋者”",
"emxarms.gun.emx_umx32.name": "§aVXM-31 “袖剑”", "emxarms.gun.emx_atlas.name": "§aVXM-31 “袖剑”",
"emxarms.gun.emx_umx57.name": "§aVXM-57 “猎剑”", "emxarms.gun.emx_prometheus.name": "§aVXM-57 “猎剑”",
"emxarms.gun.emx_scgraves.name": "§a拼装电磁枪 “革命者”", "emxarms.gun.emx_boomstick.name": "§a拼装电磁枪 “革命者”",
"emxarms.gun.emx_mg90.name": "§aAPM-130 “厄兆”", "emxarms.gun.emx_posideon.name": "§aAPM-130 “厄兆”",
"emxarms.gun.emx_mg57.name": "§aHCMG-57 “重骑兵”", "emxarms.gun.emx_zeus.name": "§aHCMG-57 “重骑兵”",
"emxarms.ammo.410x57ap.name": "§a4.10x57mm 磁钢重穿弹", "emxarms.ammo.410x57ap.name": "§a4.10x57mm 磁钢重穿弹",
"emxarms.ammo.339x57.name": "§a3.39x57mm 磁钢弹", "emxarms.ammo.339x57.name": "§a3.39x57mm 磁钢弹",
"emxarms.ammo.x16sg.name": "§aX16 磁钢集束弹", "emxarms.ammo.x16sg.name": "§aX16 磁钢集束弹",
"emxarms.ammo.402x31.name": "§a4.02x31mm 磁钢弹", "emxarms.ammo.402x31.name": "§a4.02x31mm 磁钢弹",
"emxarms.ammo.1045x103.name": "§a10.45x103mm 磁钢箭形弹", "emxarms.ammo.1045x103.name": "§a10.45x103mm 磁钢箭形弹",
"emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 战术镭射|全向握把", "emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 战术镭射|全向握把",
"emxarms.attachment.sight_emx_char1.name": "§a“字元”I型 视觉瞄准镜", "emxarms.attachment.sight_emx_char1.name": "§a“字元”I型 视觉瞄准镜",
"emxarms.attachment.sight_emx_char2.name": "§a“字元”II型 视觉瞄准镜", "emxarms.attachment.sight_emx_char2.name": "§a“字元”II型 视觉瞄准镜",
@ -38,8 +38,8 @@
"emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字节” 近战|轻量化升级", "emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字节” 近战|轻量化升级",
"emxarms.attachment.sight_emx_tanh.name": "§a“双曲函数” 组合瞄准具", "emxarms.attachment.sight_emx_tanh.name": "§a“双曲函数” 组合瞄准具",
"emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 轻量化扩容弹匣", "emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 轻量化扩容弹匣",
"emxarms.attachment.sight_emx_integer.name": "§a“整数” 全息瞄准具" "emxarms.attachment.sight_emx_integer.name": "§a“整数” 全息瞄准具"
} }

View file

@ -3,25 +3,25 @@
"pack.tacz.emx_arms_gun.desc": "EMX電磁武器庫", "pack.tacz.emx_arms_gun.desc": "EMX電磁武器庫",
"emxarms.gun.emx_rivet.name": "§aSK-217 “堅釘”", "emxarms.gun.emx_ares.name": "§aSK-217 “堅釘”",
"emxarms.gun.emx_pulse.name": "§aXSP-31 “脈衝”", "emxarms.gun.emx_typhon.name": "§aXSP-31 “脈衝”",
"emxarms.gun.emx_pulsex2.name": "§aXSP-31 “私法制裁者”", "emxarms.gun.emx_typhonx2.name": "§aXSP-31 “私法制裁者”",
"emxarms.gun.emx_draftsman.name": "§aSAIG-24 “制圖師”", "emxarms.gun.emx_helios.name": "§aSAIG-24 “制圖師”",
"emxarms.gun.emx_kund50.name": "§aMACH-50 “極地獵手”", "emxarms.gun.emx_kronos.name": "§aMACH-50 “極地獵手”",
"emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “極地探索者”", "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “極地探索者”",
"emxarms.gun.emx_pmg90.name": "§aHAER-90 “阿爾忒彌斯”", "emxarms.gun.emx_artemis.name": "§aHAER-90 “阿爾忒彌斯”",
"emxarms.gun.emx_umx32.name": "§aVXM-31 “隱劍”", "emxarms.gun.emx_atlas.name": "§aVXM-31 “隱劍”",
"emxarms.gun.emx_umx57.name": "§aVXM-57 “獵劍”", "emxarms.gun.emx_prometheus.name": "§aVXM-57 “獵劍”",
"emxarms.gun.emx_scgraves.name": "§a重櫻第一男槍 “安培切”", "emxarms.gun.emx_boomstick.name": "§a重櫻第一男槍 “安培切”",
"emxarms.gun.emx_mg90.name": "§aAPM-130 “厄兆”", "emxarms.gun.emx_posideon.name": "§aAPM-130 “厄兆”",
"emxarms.gun.emx_mg57.name": "§aHCMG-57 “重騎兵”", "emxarms.gun.emx_zeus.name": "§aHCMG-57 “重騎兵”",
"emxarms.ammo.410x57ap.name": "§a4.10x57mm 電磁穿甲彈", "emxarms.ammo.410x57ap.name": "§a4.10x57mm 電磁穿甲彈",
"emxarms.ammo.339x57.name": "§a3.39x57 電磁槍彈", "emxarms.ammo.339x57.name": "§a3.39x57 電磁槍彈",
"emxarms.ammo.x16sg.name": "§aX16 電磁霰彈", "emxarms.ammo.x16sg.name": "§aX16 電磁霰彈",
"emxarms.ammo.402x31.name": "§a4.02x31 電磁槍彈", "emxarms.ammo.402x31.name": "§a4.02x31 電磁槍彈",
"emxarms.ammo.1045x103.name": "§a10.45x103 電磁槍箭形彈", "emxarms.ammo.1045x103.name": "§a10.45x103 電磁槍箭形彈",
"emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 戰術鐳射|全向握把", "emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 戰術鐳射|全向握把",
"emxarms.attachment.sight_emx_char1.name": "§a“查爾”I型 視覺瞄準鏡", "emxarms.attachment.sight_emx_char1.name": "§a“查爾”I型 視覺瞄準鏡",
"emxarms.attachment.sight_emx_char2.name": "§a“查爾”II型 視覺瞄準鏡", "emxarms.attachment.sight_emx_char2.name": "§a“查爾”II型 視覺瞄準鏡",
@ -38,8 +38,8 @@
"emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字節” 近戰|輕量化升級", "emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字節” 近戰|輕量化升級",
"emxarms.attachment.sight_emx_tanh.name": "§a“雙曲函數” 組合瞄準具", "emxarms.attachment.sight_emx_tanh.name": "§a“雙曲函數” 組合瞄準具",
"emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 輕量化擴容彈匣", "emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 輕量化擴容彈匣",
"emxarms.attachment.sight_emx_integer.name": "§a“整數” 全息瞄準具" "emxarms.attachment.sight_emx_integer.name": "§a“整數” 全息瞄準具"
} }

View file

@ -3,7 +3,7 @@
"minecraft:geometry": [ "minecraft:geometry": [
{ {
"description": { "description": {
"identifier": "geometry.emx_rivet_geo", "identifier": "geometry.emx_ares_geo",
"texture_width": 256, "texture_width": 256,
"texture_height": 256, "texture_height": 256,
"visible_bounds_width": 3, "visible_bounds_width": 3,
@ -1555,13 +1555,13 @@
"pivot": [0, 8, -1.425] "pivot": [0, 8, -1.425]
}, },
{ {
"name": "emx_rivet", "name": "emx_ares",
"parent": "gun_and_righthand", "parent": "gun_and_righthand",
"pivot": [0, 6, -3] "pivot": [0, 6, -3]
}, },
{ {
"name": "display_illuminated", "name": "display_illuminated",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8], "pivot": [0, 0, -8],
"cubes": [ "cubes": [
{ {
@ -1600,7 +1600,7 @@
}, },
{ {
"name": "body", "name": "body",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8], "pivot": [0, 0, -8],
"cubes": [ "cubes": [
{ {
@ -5914,7 +5914,7 @@
}, },
{ {
"name": "stock_default1", "name": "stock_default1",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8], "pivot": [0, 0, -8],
"cubes": [ "cubes": [
{ {
@ -6489,17 +6489,17 @@
}, },
{ {
"name": "charge", "name": "charge",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8] "pivot": [0, 0, -8]
}, },
{ {
"name": "mount", "name": "mount",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8] "pivot": [0, 0, -8]
}, },
{ {
"name": "falkmuzzle_default", "name": "falkmuzzle_default",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 0, -8], "pivot": [0, 0, -8],
"cubes": [ "cubes": [
{ {
@ -7373,7 +7373,7 @@
}, },
{ {
"name": "sight", "name": "sight",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 8.32813, -12.5], "pivot": [0, 8.32813, -12.5],
"cubes": [ "cubes": [
{ {
@ -7885,7 +7885,7 @@
}, },
{ {
"name": "refit_pos", "name": "refit_pos",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 6, -3] "pivot": [0, 6, -3]
}, },
{ {
@ -7915,7 +7915,7 @@
}, },
{ {
"name": "constraint", "name": "constraint",
"parent": "emx_rivet", "parent": "emx_ares",
"pivot": [0, 11.5, -20] "pivot": [0, 11.5, -20]
}, },
{ {
@ -8025,4 +8025,4 @@
] ]
} }
] ]
} }

View file

@ -3,7 +3,7 @@
"minecraft:geometry": [ "minecraft:geometry": [
{ {
"description": { "description": {
"identifier": "geometry.draftsman", "identifier": "geometry.helios",
"texture_width": 256, "texture_width": 256,
"texture_height": 256, "texture_height": 256,
"visible_bounds_width": 6, "visible_bounds_width": 6,
@ -10700,4 +10700,4 @@
] ]
} }
] ]
} }

View file

@ -1,5 +1,5 @@
{ {
"version": "0.2.4-1", "version": "0.2.4-2",
"name": "pack.tacz.emx_arms_gun.name", "name": "pack.tacz.emx_arms_gun.name",
"desc": "pack.tacz.emx_arms_gun.desc", "desc": "pack.tacz.emx_arms_gun.desc",
"license": "CC BY-NC-ND 4.0", "license": "CC BY-NC-ND 4.0",

View file

Binary file not shown.

Binary file not shown.

15
emxarms/python/temp.py Normal file
View file

@ -0,0 +1,15 @@
import os
def rename_files(root_dir, old_str, new_str):
for dirpath, dirnames, filenames in os.walk(root_dir):
for filename in filenames:
if old_str in filename:
old_file = os.path.join(dirpath, filename)
new_file = os.path.join(dirpath, filename.replace(old_str, new_str))
os.rename(old_file, new_file)
print(f'Renamed: {old_file} to {new_file}')

View file

@ -42,6 +42,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_pmg90e" "id": "emxarms:emx_apollo"
} }
} }

View file

@ -35,6 +35,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_rivet" "id": "emxarms:emx_ares"
} }
} }

View file

@ -42,6 +42,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_pmg90" "id": "emxarms:emx_artemis"
} }
} }

View file

@ -35,6 +35,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_umx32" "id": "emxarms:emx_atlas"
} }
} }

View file

@ -27,6 +27,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_scgraves" "id": "emxarms:emx_boomstick"
} }
} }

View file

@ -33,7 +33,7 @@
], ],
"result": { "result": {
"type": "gun", "type": "gun",
"id": "emxarms:emx_enforcer", "id": "emxarms:emx_charon",
"attachments": { "attachments": {
"scope": "emxarms:sight_emx_laterano" "scope": "emxarms:sight_emx_laterano"
} }

View file

@ -42,6 +42,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_draftsman" "id": "emxarms:emx_helios"
} }
} }

View file

@ -35,6 +35,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_kund50" "id": "emxarms:emx_kronos"
} }
} }

View file

@ -23,7 +23,7 @@
"type": "forge:partial_nbt", "type": "forge:partial_nbt",
"item": "tacz:modern_kinetic_gun", "item": "tacz:modern_kinetic_gun",
"nbt": { "nbt": {
"GunId": "emxarms:emx_kund50" "GunId": "emxarms:emx_kronos"
} }
}, },
"count": 1 "count": 1
@ -37,7 +37,7 @@
], ],
"result": { "result": {
"type": "gun", "type": "gun",
"id": "emxarms:emx_kund50ex", "id": "emxarms:emx_kronosex",
"attachments": { "attachments": {
"scope": "emxarms:sight_emx_demo2", "scope": "emxarms:sight_emx_demo2",
"muzzle": "emxarms:bayonet_emx_skyhunter" "muzzle": "emxarms:bayonet_emx_skyhunter"

View file

@ -42,6 +42,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_mg90" "id": "emxarms:emx_posideon"
} }
} }

View file

@ -35,6 +35,6 @@
// //
"type": "gun", "type": "gun",
// //
"id": "emxarms:emx_umx57" "id": "emxarms:emx_prometheus"
} }
} }

Some files were not shown because too many files have changed in this diff Show more