Autovw
commented
2 years ago There's too many conflicts with this PR, I can't merge it.
Let me explain why: Your fork of the Additional Guns repository is not up-to-date with the latest changes on the parent repository. After your previous PR had been merged changes were made to some of the files you submitted. Now you are trying to submit the same files from your previous PR (which are no longer identical because changes to them were made) plus the new models on top of that. Changes are not automatically synced between the main repository and the forked repositories, you need to do this manually!
The easiest way to fix this would be to delete your fork of the repository and create a new, fresh, fork which is up-to-date. After you've done that you should create a separate branch from the main branch each time you want to do a new PR and commit to that branch instead. This way you can keep your main branch up-to-date with the main branch from this repository! (Read more about that here)
We should probably make a guide on how to do contributions correctly to prevent these conflicts in the future.
MAC-10 Basic Bullet Machine gun sound Attachements Scope Silencer Gun stats? (idk how to name this) Damage: 4 Bullets: 20 Speed: copy from Vector Automatic: yes
Desert Eagle
Basic Bullet
Shotgun sound
Attachements
Scope
Silencer
Gun stats? (idk how to name this)
Damage: 10
Bullets: 7
Speed: like a stock pistol from cvm
Automatic: no
SCOPE Very Long Scope Please write me in the MrPineapple server about the characteristics, just i dont know what i need to write here