Skip to content

Commit 8365b8b

Browse files
IoeCmcomcIoeCmcomc
authored
Merge pull request #8 from IoeCmcomc/dev
Merge 'dev' branch, which implements v0.7.0
2 parents 6281832 + 5cf02cc commit 8365b8b

File tree

751 files changed

+19005
-11663
lines changed

Some content is hidden

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

751 files changed

+19005
-11663
lines changed

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,8 @@ compile_commands.json
5151
# QtCreator local machine specific files for imported projects
5252
*creator.user*
5353

54-
# Others
55-
*.ink
54+
# MCDatapacker-specific
55+
*.ink
56+
tools/data_collectors/**/*.json
57+
tools/data_collectors/texture
58+
tools/info_diff

‎.gitmodules‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
url = git@github.com:goldsborough/lru-cache.git
1616
[submodule "lib/QSimpleUpdater"]
1717
path = lib/QSimpleUpdater
18-
url = https://github.com/ultravires/QSimpleUpdater.git
18+
url = https://github.com/alex-spataru/QSimpleUpdater.git
1919
[submodule "lib/miniz-cpp"]
2020
path = lib/miniz/miniz-cpp
2121
url = https://github.com/vishal-ahirwar/miniz-cpp.git
@@ -43,12 +43,39 @@
4343
[submodule "resource/minecraft/info/1.18/registries"]
4444
path = resource/minecraft/info/1.18/registries
4545
url = https://github.com/misode/mcmeta.git
46-
[submodule "resource/app/fonts/Monocraft"]
47-
path = resource/app/fonts/Monocraft
48-
url = https://github.com/IdreesInc/Monocraft.git
4946
[submodule "resource/minecraft/info/1.18.2/summary"]
5047
path = resource/minecraft/info/1.18.2/summary
5148
url = https://github.com/misode/mcmeta.git
5249
[submodule "resource/minecraft/info/1.18.2/registries"]
5350
path = resource/minecraft/info/1.18.2/registries
5451
url = https://github.com/misode/mcmeta.git
52+
[submodule "lib/uberswitch/uberswitch"]
53+
path = lib/uberswitch/uberswitch
54+
url = https://github.com/falemagn/uberswitch.git
55+
[submodule "lib/libqdark/libqdark"]
56+
path = lib/libqdark/libqdark
57+
url = https://github.com/IoeCmcomc/libqdark.git
58+
[submodule "resource/minecraft/info/1.19/summary"]
59+
path = resource/minecraft/info/1.19/summary
60+
url = https://github.com/misode/mcmeta.git
61+
[submodule "resource/minecraft/info/1.19/registries"]
62+
path = resource/minecraft/info/1.19/registries
63+
url = https://github.com/misode/mcmeta.git
64+
[submodule "resource/minecraft/info/1.19.3/summary"]
65+
path = resource/minecraft/info/1.19.3/summary
66+
url = https://github.com/misode/mcmeta.git
67+
[submodule "resource/minecraft/info/1.19.3/registries"]
68+
path = resource/minecraft/info/1.19.3/registries
69+
url = https://github.com/misode/mcmeta.git
70+
[submodule "resource/minecraft/info/1.19.4/registries"]
71+
path = resource/minecraft/info/1.19.4/registries
72+
url = https://github.com/misode/mcmeta.git
73+
[submodule "resource/minecraft/info/1.19.4/summary"]
74+
path = resource/minecraft/info/1.19.4/summary
75+
url = https://github.com/misode/mcmeta.git
76+
[submodule "resource/minecraft/info/1.20/registries"]
77+
path = resource/minecraft/info/1.20/registries
78+
url = https://github.com/misode/mcmeta.git
79+
[submodule "resource/minecraft/info/1.20/summary"]
80+
path = resource/minecraft/info/1.20/summary
81+
url = https://github.com/misode/mcmeta.git

‎MCDatapacker.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ SUBDIRS = \
55
src \
66
test
77

8+
89
src.depends = lib
910
test.depends = src
11+
#test.depends = lib
1012

1113
OTHER_FILES += uncrustify.cfg

‎MCDatapacker_vi_VN.qph‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,32 @@
252252
<source>Save all</source>
253253
<target>Lưu tất cả</target>
254254
</phrase>
255+
<phrase>
256+
<source>Chat type</source>
257+
<target>Loại trò chuyện</target>
258+
</phrase>
259+
<phrase>
260+
<source>Damage type</source>
261+
<target>Loại sát thương</target>
262+
</phrase>
263+
<phrase>
264+
<source>Dimension</source>
265+
<target>Chiều không gian</target>
266+
</phrase>
267+
<phrase>
268+
<source>Dimension type</source>
269+
<target>Loại chiều không gian</target>
270+
</phrase>
271+
<phrase>
272+
<source>Trim material</source>
273+
<target>Vật liệu trang trí</target>
274+
</phrase>
275+
<phrase>
276+
<source>Trim pattern</source>
277+
<target>Hoa văn trang trí</target>
278+
</phrase>
279+
<phrase>
280+
<source>Redstone</source>
281+
<target>Redstone</target>
282+
</phrase>
255283
</QPH>

‎lib/QFindDialogs/QFindDialogs.pro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ TEMPLATE = lib
99

1010
CONFIG += staticlib
1111

12+
msvc:DEFINES += and="\"&&\"" or="\"||\""
13+
1214
HEADERS = \
1315
$$PWD/QFindDialogs/src/finddialog.h \
1416
$$PWD/QFindDialogs/src/findreplacedialog.h

‎lib/QSimpleUpdater‎

‎lib/json/json.pri‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
HEADERS += $$PWD/json/single_include/nlohmann/json.hpp
2+
3+
DISTFILES += $$PWD/json/LICENSE.MIT
4+
5+
INCLUDEPATH += $$PWD/json/single_include
6+

‎lib/json/json.pro‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎lib/lib.pro‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
TEMPLATE = subdirs
22

33
SUBDIRS = \
4-
QFindDialogs \
5-
json \
6-
lru-cache \
74
nbt \
8-
miniz
5+
QFindDialogs

‎lib/libqdark/libqdark‎

Submodule libqdark added at 885ef11

0 commit comments

Comments
 (0)