Skip to content

Commit 526a074

Browse files
dandoesgithubdandoesgithub
committed
Merge branch 'unity' into shoemaker-integration
# Conflicts: # Runtime/PatchManager.cs # Runtime/Planets/Shoemaker/Directory.Build.targets
2 parents 72d97e8 + e68d10c commit 526a074

File tree

9 files changed

+148
-109
lines changed

9 files changed

+148
-109
lines changed

‎Runtime/Planets/Shoemaker/Directory.Build.targets‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎images/icon.png.meta‎

Lines changed: 127 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎patch_tests/patches/celestial_body.patch.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎patch_tests/patches/test.patch.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plugin_template/swinfo.json.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/build-debug.bat‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎scripts/build-deploy.bat‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎scripts/build-release.bat‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎scripts/build-run.bat‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)