Skip to content

Commit 43e384e

Browse files
authored
Merge pull request #62 from jbunke/dev
1.2.0
2 parents 43d2004 + 413b08b commit 43e384e

File tree

498 files changed

+2790
-2624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+2790
-2624
lines changed

.github/workflows/copy_license.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Check if LICENSE file needs to be updated
1717
id: check_license
1818
run: |
19-
if [ ! -f LICENSE ] || ! cmp -s res/tooltips/LICENSE.txt LICENSE; then
19+
if [ ! -f LICENSE ] || ! cmp -s res/text/LICENSE.txt LICENSE; then
2020
echo "needs_update=true" >> $GITHUB_ENV
2121
else
2222
echo "needs_update=false" >> $GITHUB_ENV
@@ -25,7 +25,7 @@ jobs:
2525
- name: Copy LICENSE file
2626
if: env.needs_update == 'true'
2727
run: |
28-
cp res/tooltips/LICENSE.txt LICENSE
28+
cp res/text/LICENSE.txt LICENSE
2929
3030
- name: Commit and push changes
3131
if: env.needs_update == 'true'

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
/out/
2-
/.idea/
3-
*.iml
42
*.log
53
*.stip

.idea/.gitignore

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

.idea/artifacts/dev_build.xml

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

.idea/artifacts/release.xml

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

.idea/artifacts/tdsm_core.xml

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

.idea/libraries/delta_time_core.xml

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

.idea/libraries/delta_time_fonts.xml

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

.idea/libraries/delta_time_menu_extension.xml

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

.idea/libraries/delta_time_sprite.xml

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

0 commit comments

Comments
 (0)