Merge branch 'development'

IoeCmcomc · Nov 16, 2019 · 3c96b0d · 3c96b0d
2 parents 06be893 + 10c77a1
commit 3c96b0d
Show file tree

Hide file tree

Showing 23 changed files with 901 additions and 248 deletions.
diff --git a/.gitignore b/.gitignore
@@ -329,14 +329,26 @@ ASALocalRun/
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
 
-## Ignore output/exported files.
+## Ignore output/exported files and datapacks.
 *.nbs
 *.mid
+*.mp3
+add*/
+pack.mcmeta/
 
 ## Ignore other files/folders.
 #*.ico
 *.spec
 *.bat
+*.pyo
 version.*
+
+.vscode/
+
 build/
-dist/
+dist/
+main.build/
+main.dist/
+
+sounds/block.note.sax.ogg
+setup.py
diff --git a/attr.py b/attr.py
@@ -13,7 +13,7 @@
 # Author: IoeCmcomc (https://github.com/IoeCmcomc)
 # Programming language: Python
 # License: MIT license
-# Version: 0,50
+# Version: 0.7.0
 # Source codes are hosted on: GitHub (https://github.com/IoeCmcomc/NBSTool)
 #‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 

diff --git a/ffmpeg/bin/ffmpeg.exe b/ffmpeg/bin/ffmpeg.exe
diff --git a/ffmpeg/bin/ffprobe.exe b/ffmpeg/bin/ffprobe.exe