Merge branch 'dev'

Author: IoeCmcomc

.gitattributes

@@ -0,0 +1 @@
+*.cbor binary

.gitignore

@@ -51,13 +51,190 @@ compile_commands.json
 # QtCreator local machine specific files for imported projects
 *creator.user*
 
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
 # MCDatapacker-specific
 *.ink
+*.Ink
 tools/data_collectors/**/*.json
 tools/data_collectors/texture
 tools/info_diff
+tools/**/*.txt
+build/
 
 # Python
 __pycache__/
 *.py[cod]
 *$py.class
+*.qtvscr
+*.vcxproj
+*.filters
+*.rc
+*.sln

.gitmodules

@@ -25,72 +25,138 @@
 [submodule "lib/libqdark/libqdark"]
 	path = lib/libqdark/libqdark
 	url = https://github.com/IoeCmcomc/libqdark.git
-[submodule "resource/minecraft/info/1.19/registries"]
-	path = resource/minecraft/info/1.19/registries
+[submodule "res/mc/info/1.19/registries"]
+	path = res/mc/info/1.19/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.19.3/summary"]
-	path = resource/minecraft/info/1.19.3/summary
+[submodule "res/mc/info/1.19.3/summary"]
+	path = res/mc/info/1.19.3/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.19.3/registries"]
-	path = resource/minecraft/info/1.19.3/registries
+[submodule "res/mc/info/1.19.3/registries"]
+	path = res/mc/info/1.19.3/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.19.4/registries"]
-	path = resource/minecraft/info/1.19.4/registries
+[submodule "res/mc/info/1.19.4/registries"]
+	path = res/mc/info/1.19.4/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.19.4/summary"]
-	path = resource/minecraft/info/1.19.4/summary
+[submodule "res/mc/info/1.19.4/summary"]
+	path = res/mc/info/1.19.4/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20/registries"]
-	path = resource/minecraft/info/1.20/registries
+[submodule "res/mc/info/1.20/registries"]
+	path = res/mc/info/1.20/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20/summary"]
-	path = resource/minecraft/info/1.20/summary
+[submodule "res/mc/info/1.20/summary"]
+	path = res/mc/info/1.20/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.15/summary"]
-	path = resource/minecraft/info/1.15/summary
+[submodule "res/mc/info/1.15/summary"]
+	path = res/mc/info/1.15/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.15/registries"]
-	path = resource/minecraft/info/1.15/registries
+[submodule "res/mc/info/1.15/registries"]
+	path = res/mc/info/1.15/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.16/registries"]
-	path = resource/minecraft/info/1.16/registries
+[submodule "res/mc/info/1.16/registries"]
+	path = res/mc/info/1.16/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.16/summary"]
-	path = resource/minecraft/info/1.16/summary
+[submodule "res/mc/info/1.16/summary"]
+	path = res/mc/info/1.16/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.17/summary"]
-	path = resource/minecraft/info/1.17/summary
+[submodule "res/mc/info/1.17/summary"]
+	path = res/mc/info/1.17/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.17/registries"]
-	path = resource/minecraft/info/1.17/registries
+[submodule "res/mc/info/1.17/registries"]
+	path = res/mc/info/1.17/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.18/registries"]
-	path = resource/minecraft/info/1.18/registries
+[submodule "res/mc/info/1.18/registries"]
+	path = res/mc/info/1.18/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.18/summary"]
-	path = resource/minecraft/info/1.18/summary
+[submodule "res/mc/info/1.18/summary"]
+	path = res/mc/info/1.18/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.18.2/summary"]
-	path = resource/minecraft/info/1.18.2/summary
+[submodule "res/mc/info/1.18.2/summary"]
+	path = res/mc/info/1.18.2/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.18.2/registries"]
-	path = resource/minecraft/info/1.18.2/registries
+[submodule "res/mc/info/1.18.2/registries"]
+	path = res/mc/info/1.18.2/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.19/summary"]
-	path = resource/minecraft/info/1.19/summary
+[submodule "res/mc/info/1.19/summary"]
+	path = res/mc/info/1.19/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20.2/summary"]
-	path = resource/minecraft/info/1.20.2/summary
+[submodule "res/mc/info/1.20.2/summary"]
+	path = res/mc/info/1.20.2/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20.2/registries"]
-	path = resource/minecraft/info/1.20.2/registries
+[submodule "res/mc/info/1.20.2/registries"]
+	path = res/mc/info/1.20.2/registries
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20.4/summary"]
-	path = resource/minecraft/info/1.20.4/summary
+[submodule "res/mc/info/1.20.4/summary"]
+	path = res/mc/info/1.20.4/summary
 	url = https://github.com/misode/mcmeta.git
-[submodule "resource/minecraft/info/1.20.4/registries"]
-	path = resource/minecraft/info/1.20.4/registries
+[submodule "res/mc/info/1.20.4/registries"]
+	path = res/mc/info/1.20.4/registries
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20.4/data-json"]
+	path = res/mc/info/1.20.4/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.15/data-json"]
+	path = res/mc/info/1.15/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.16/data-json"]
+	path = res/mc/info/1.16/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.17/data-json"]
+	path = res/mc/info/1.17/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.18/data-json"]
+	path = res/mc/info/1.18/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.18.2/data-json"]
+	path = res/mc/info/1.18.2/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.19/data-json"]
+	path = res/mc/info/1.19/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.19.3/data-json"]
+	path = res/mc/info/1.19.3/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.19.4/data-json"]
+	path = res/mc/info/1.19.4/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20/data-json"]
+	path = res/mc/info/1.20/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20.2/data-json"]
+	path = res/mc/info/1.20.2/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20.6/data-json"]
+	path = res/mc/info/1.20.6/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21/data-json"]
+	path = res/mc/info/1.21/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20.6/registries"]
+	path = res/mc/info/1.20.6/registries
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21/registries"]
+	path = res/mc/info/1.21/registries
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.20.6/summary"]
+	path = res/mc/info/1.20.6/summary
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21/summary"]
+	path = res/mc/info/1.21/summary
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.4/data-json"]
+	path = res/mc/info/1.21.4/data-json
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.4/summary"]
+	path = res/mc/info/1.21.4/summary
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.4/registries"]
+	path = res/mc/info/1.21.4/registries
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.3/summary"]
+	path = res/mc/info/1.21.3/summary
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.3/registries"]
+	path = res/mc/info/1.21.3/registries
+	url = https://github.com/misode/mcmeta.git
+[submodule "res/mc/info/1.21.3/data-json"]
+	path = res/mc/info/1.21.3/data-json
 	url = https://github.com/misode/mcmeta.git
-[submodule "lib/qlementine/qlementine"]
-	path = lib/qlementine/qlementine
-	url = https://github.com/oclero/qlementine.git

lib/QSimpleUpdater

@@ -2,5 +2,4 @@ TEMPLATE = subdirs
 
 SUBDIRS = \
     nbt \
-    QFindDialogs \
-    qlementine
+    QFindDialogs