weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Database.lua
This commit is contained in:
Applevangelist
2023-08-18 08:49:50 +02:00
parent 18296fb4b1 fe7acecdd3
commit b873b7993e
8 changed files with 764 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Modules.lua
View File

@@ -53,6 +53,7 @@ __Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
__Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' )
__Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' )
__Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' )
__Moose.Include( 'Scripts/Moose/Wrapper/Storage.lua' )
--__Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' )
--__Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' )