Skip to content

Commit 3c96b0d

Browse files
committed
Merge branch 'development'
2 parents 06be893 + 10c77a1 commit 3c96b0d

23 files changed

+901
-248
lines changed

.gitignore

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,26 @@ ASALocalRun/
329329
# MFractors (Xamarin productivity tool) working folder
330330
.mfractor/
331331

332-
## Ignore output/exported files.
332+
## Ignore output/exported files and datapacks.
333333
*.nbs
334334
*.mid
335+
*.mp3
336+
add*/
337+
pack.mcmeta/
335338

336339
## Ignore other files/folders.
337340
#*.ico
338341
*.spec
339342
*.bat
343+
*.pyo
340344
version.*
345+
346+
.vscode/
347+
341348
build/
342-
dist/
349+
dist/
350+
main.build/
351+
main.dist/
352+
353+
sounds/block.note.sax.ogg
354+
setup.py

attr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Author: IoeCmcomc (https://github.com/IoeCmcomc)
1414
# Programming language: Python
1515
# License: MIT license
16-
# Version: 0,50
16+
# Version: 0.7.0
1717
# Source codes are hosted on: GitHub (https://github.com/IoeCmcomc/NBSTool)
1818
#‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
1919

ffmpeg/bin/ffmpeg.exe

3.57 MB
Binary file not shown.

ffmpeg/bin/ffprobe.exe

3.55 MB
Binary file not shown.

0 commit comments

Comments
 (0)