Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Акуталка #97

Merged
merged 62 commits into from
Oct 20, 2024
Merged

Акуталка #97

merged 62 commits into from
Oct 20, 2024

Conversation

VoiceInYourHead
Copy link
Owner

No description provided.

actions-user and others added 30 commits September 14, 2024 01:21
@actions-user
Automatic changelog compile [ci skip]
aaa1bf7
@BonniePandora
Overhauls the synthetics vendors (#449)
6120fd4
@Ediblebomb
add flamer fueltank pouches to the garrow (#448)
b11f66f
@cm13-github
Automatic changelog for PR #449 [ci skip]
25ad667
@AmoryBlaine
Hair Fix (#446)
967e8cd
@Max-023
Return of the M37 (#443)
33a3013 
Co-authored-by: Dumbgunner <[email protected]>
@cm13-github
Automatic changelog for PR #443 [ci skip]
442ee1b
@actions-user
Automatic changelog compile [ci skip]
a8b57f4
@AndroBetel
removes random table in briefing (#459)
cfcf843
@AmoryBlaine
Spearhead onmob icon fix (#467)
7c7eaf4
@AmoryBlaine
Uncoloured prefab window (#470)
826a340
@Doubleumc
Medical vendor Create&Destroy fix (#478)
6d9e485
@AmoryBlaine
M41 Magazine Can Sprite Fix (#475)
b0e7f82
@AmoryBlaine @Doubleumc
literally just empty gun racks (#466)
fdf2f5d 
Co-authored-by: Doubleumc <[email protected]>
@AmoryBlaine @Doubleumc @AndroBetel
Folders, Notepad and Book Icon Updates and new props (#465)
397ab36 
Co-authored-by: Doubleumc <[email protected]>
Co-authored-by: AndroBetel <[email protected]>
@AndroBetel
sadar buffs (#444)
1abbb04
@KoishiVibe
Interim Removal Of CLF Special Gear (#460)
6d0bde4 
Co-authored-by: KoishiVibe <[email protected]>
@cm13-github
Automatic changelog for PR #444 [ci skip]
9be37a8
@GriffinMan4455
Construction Pouches carry filled Sandbags + Bag Stack Change (#477)
15b9952
@BonniePandora @Pandoras-Alt
Adds the M579 Aerial-Defence System Carrier (AKA, the AA-APC, or LAV-…
9ed6d33 
…AD of the future) (#429)

Co-authored-by: BonniePandora <[email protected]>
@AmoryBlaine
M5 standardized (#473)
042c72c
@BonniePandora
Updates synth's headset tracking options (#481)
5d62427
@Doubleumc
Tacmap access for main platoon (#463)
cf4a809
@AmoryBlaine
Russian Patois (#416)
9b0a601
@Ediblebomb
railgun should probably be able to see flares (#464)
83887dd
@BonniePandora
US Armed Forces update framework (#468)
5b9d595
@Max-023
Removes HEFA Knights Reference From Big Red (#471)
04fe51b 
Co-authored-by: Max-023 <[email protected]>
@cm13-github
Automatic changelog for PR #429 [ci skip]
792edec
@cm13-github
Automatic changelog for PR #481 [ci skip]
e03fe8d
@cm13-github
Automatic changelog for PR #463 [ci skip]
6581b06
actions-user and others added 27 commits October 1, 2024 01:41
@actions-user
Automatic changelog compile [ci skip]
c63286b
@BonniePandora
Brings back PltCo medal awarding (#493)
278bad6
@cm13-github
Automatic changelog for PR #493 [ci skip]
8c65350
@actions-user
Automatic changelog compile [ci skip]
4cc2cd4
@GriffinMan4455 @AndroBetel
Walkman Lore Edit (#479)
34d2cac 
Co-authored-by: AndroBetel <[email protected]>
@cm13-github
Automatic changelog for PR #479 [ci skip]
8e1628a
@actions-user
Automatic changelog compile [ci skip]
ab11cc9
@BonniePandora
More plushies (#492)
075a6a4
@BonniePandora
Allows Mk1 & NSG mag boxes to be carried on back (again?) (#494)
9de9617
@cm13-github
Automatic changelog for PR #492 [ci skip]
ab9843a
@Max-023
Green Balaclava fix (#488)
a66eaa2 
Co-authored-by: Dumbgunner <[email protected]>
@cm13-github
Automatic changelog for PR #494 [ci skip]
54fd0f9
@AmoryBlaine
American Spirit (#485)
327b59c
@cm13-github
Automatic changelog for PR #488 [ci skip]
35ce848
@AmoryBlaine @Doubleumc
Kills weather site overlays (#320)
2984293 
Co-authored-by: Doubleumc <[email protected]>
@AmoryBlaine
better floors (#486)
8b8ad07
@BonniePandora
Replaces giant spider spirtes (#490)
d742a87
@AmoryBlaine
EMERGENCY Gin bottle replacer (#484)
94d9d3a
@cm13-github
Automatic changelog for PR #490 [ci skip]
cf144a5
@AmoryBlaine
Cultists can't see in the dark (#489)
d2a0613
@actions-user
Automatic changelog compile [ci skip]
51536f2
@GriffinMan4455
Lets try this again: Makes cassette pouches hold slightly more tapes (#…
c521fcd 
…505)
@AmoryBlaine
O1 and O2 use pins instead of bars (#502)
949617a
@Doubleumc
Fix for "Kills weather site overlays" (#499)
600c3e3
@Doubleumc
No time-based ranks (#498)
835b9f3
@cm13-github
Automatic changelog for PR #498 [ci skip]
043c155
@actions-user
Automatic changelog compile [ci skip]
ea4ae75
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@VoiceInYourHead VoiceInYourHead merged commit d192ad9 into VoiceInYourHead:merge-upstream Oct 20, 2024
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Merge Conflict
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.