mirror of
https://github.com/Outer-Wilds-New-Horizons/new-horizons.git
synced 2025-12-11 20:15:44 +01:00
cbd0109ea0
# Conflicts: # NewHorizons/Builder/Body/FunnelBuilder.cs # NewHorizons/External/Configs/PlanetConfig.cs # NewHorizons/External/Configs/StarSystemConfig.cs # NewHorizons/External/Modules/AsteroidBeltModule.cs # NewHorizons/External/Modules/AtmosphereModule.cs # NewHorizons/External/Modules/BaseModule.cs # NewHorizons/External/Modules/OrbitModule.cs # NewHorizons/External/Modules/PropModule.cs # NewHorizons/External/Modules/ShipLogModule.cs # NewHorizons/External/Modules/SignalModule.cs # NewHorizons/External/Modules/VariableSize/FunnelModule.cs # NewHorizons/External/Modules/VariableSize/RingModule.cs # NewHorizons/External/Modules/VariableSize/SingularityModule.cs # NewHorizons/External/Modules/VariableSize/StarModule.cs # NewHorizons/Main.cs