FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Modules.lua
This commit is contained in:
Applevangelist
2024-01-11 12:53:30 +01:00
parent 5680344dfd 8b08942c4d
commit 54b49ff0d6
5 changed files with 153 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -228,6 +228,9 @@ pip-log.txt
#Goodsync
_gsdata_/
# PyCharm
.idea
#GITHUB
Moose Test Missions/MOOSE_Test_Template.miz
Moose Development/Moose/.vscode/launch.json