Merged
Conversation
Collaborator
funkyfranky
commented
Feb 26, 2026
funkyfranky
commented
- Merge develop into master-ng as this is the default branch now
Merge from master
# Conflicts: # Moose Development/Moose/Functional/PseudoATC.lua
Merge from master
Merge from master
Update Database.lua
Merge from master
**WAREHOUSE** - Switched from AI_CARGO_DISPATCHER to OPSTRANSPORT **OPSTRANSPORT** - Fixed bugs
# Conflicts: # Moose Development/Moose/Cargo/Cargo.lua
Merge from master
Update Utils.lua
Merge from master
Update Airbase.lua
Merge from master-ng
- Added GetCargoSet function
- Added new Weapon type enums - Added torpedos to Auto weapon type
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
2 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.