Merging Develop Branch of Liberation into main#96
Open
Othello311 wants to merge 82 commits intomainfrom
Open
Conversation
+Ardenian faction Tweaked ION woodland Tweaked USAF +Ardenian to init_preset
Built Compositions -Full starting composition w/tools -just Liberation tools -just slotting composition
+Sumava mission base file folder
+Arsenal Whitelist
+ MK 18
+updated start compositions +st kapaulio base file -updated and rename altis mbf
+little bird to starting area, was missing
+little bird spawns =repaired little bird spawns
=checking faction and arsenal in preset +name change to folders (7cav_lib_...)
+ HEDP & HET 40mm + MP7 variants + Squad names on St. Kapaulia
Created Ussr Faction
-Changed production interval from 14 to 20 mins
+AR2 darter +SR 25 mags
Added myself to Commander permission
New Cba Settings
Updated Slottings, Mission Markers, and Overall fix to the current broken mission sqm on dev branch
Updated Slotting
+Rotary flight suit and vests +all the stupid USP bag name updates
added HK 416, SA 58, and magazines
+proper FAL and mags
+TA01NSN optic
-removed several members (liber, syniron, velasques, santoyo, tucker, kiser, eugene, dio, harsh) +Moraru
+Osprey and Armed Osprey -comment out AC-130U
+Rodhal to whitelist +new CBA settings in line with modpack change and mod updates
+ P320 and magazine to whitelist.
+green sea MBF +updated CBA settings
+ sparrow - kastor and morozov
+Neubauer
+Ronen.R to whitelist
-Abate, Nomad, Telinov
+Bethea.A
+mitchell.b
+mitchell, hamm
+Pierce, Rok -Lamb
+york.k
+blake
+suto
-york.k
+Budz.P
+Peterson.L
Cleanup of Zeus Whitelist
Fix for updated CBA
This reverts commit 3e385a8.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
Content:
Successfully tested on: