Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Zylann/godot_voxel
Browse files Browse the repository at this point in the history
  • Loading branch information
Zylann committed Jul 6, 2024
2 parents 3d98bc9 + aadc3ca commit a0bceb6
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 8 deletions.
14 changes: 13 additions & 1 deletion .github/workflows/fuzzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@ jobs:
${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
${{github.job}}-${{env.GODOT_BASE_BRANCH}}
# Fix the issue of running out of disk space during Compilation stage
# Taken from here: https://github.com/orgs/community/discussions/26351#discussioncomment-3251595
- name: Free disk space
run: |
sudo swapoff -a
sudo rm -f /swapfile
sudo apt-get clean
docker rmi $(docker image ls -aq)
df -h
# NO-PIE is for more detailed bactraces with line symbols
- name: Compilation
env:
Expand Down Expand Up @@ -107,7 +117,9 @@ jobs:
uses: actions/checkout@v4
with:
repository: qarmin/Qarminer
ref: ${{ env.GODOT_BASE_BRANCH }}
# At the time of writing, qarmin did not put out later than 4.1 versions, but claims that it works with Godot versions up to 4.3+
# See https://github.com/qarmin/Qarminer/issues/32
ref: 4.1
path: fuzzer

- name: Copy fuzzer settings
Expand Down
24 changes: 17 additions & 7 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
Voxel Tools for Godot Engine
--------------------------------
MIT License

Copyright (c) 2016-2022 Marc Gilleron
Copyright (c) 2016-2024 Marc Gilleron

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

0 comments on commit a0bceb6

Please sign in to comment.