Compare commits

...

28 commits

Author SHA1 Message Date
adf0f9ed2a Revert "Merge branch 'master' into hardcore"
This reverts commit 960ad382dd, reversing
changes made to cc4af040a1.
2020-08-19 16:42:14 +02:00
960ad382dd Merge branch 'master' into hardcore 2020-08-19 16:38:33 +02:00
c377febc88 fix forge version 2020-08-18 21:54:30 +02:00
044072d698 Merge remote-tracking branch 'original/master' 2020-08-17 19:20:48 +02:00
f50dcdbb34 add description 2020-08-16 19:58:53 +02:00
4855de2841 more mpt download threads 2020-08-15 16:26:22 +02:00
d91c4eb94f Merge remote-tracking branch 'original/master' 2020-08-15 16:20:35 +02:00
67b8bb0faa Merge remote-tracking branch 'original/master' 2020-08-09 11:58:35 +02:00
e48d67a1bd Merge remote-tracking branch 'original/master' 2020-08-09 00:12:16 +02:00
c1be839bff Merge remote-tracking branch 'original/master' 2020-08-08 14:51:20 +02:00
20a8470b39 Merge remote-tracking branch 'original/master' 2020-08-08 12:35:38 +02:00
e214a9c3d0 Merge remote-tracking branch 'original/master' 2020-08-04 19:36:11 +02:00
0ec3b4ea18 merge and small fix 2020-08-02 19:51:22 +02:00
e229b02460 Merge remote-tracking branch 'original/master' 2020-08-02 19:30:14 +02:00
533077d863 Merge remote-tracking branch 'original/master' 2020-08-02 17:06:23 +02:00
7e25d15de1 remove build script notice from readme 2020-07-30 12:02:29 +02:00
cfde58e384 Merge remote-tracking branch 'original/master' 2020-07-30 11:55:36 +02:00
4d5ba4d1a2 added meta info to texture packs. 2020-07-29 21:27:38 +02:00
2c62649172 update modpack.json 2020-07-29 20:48:10 +02:00
81e6ee171b Merge remote-tracking branch 'original/master' 2020-07-29 20:47:28 +02:00
c3e69a6238 Merge remote-tracking branch 'original/master' 2020-07-29 19:15:39 +02:00
041f844408 remove mpt script 2020-07-29 17:48:11 +02:00
b293cbf1dc Merge remote-tracking branch 'original/master' 2020-07-29 17:47:21 +02:00
5d9ba319e1 Merge remote-tracking branch 'original/master' 2020-07-29 12:37:44 +02:00
aaf24aef71 remove server options for resource packs 2020-07-29 00:30:39 +02:00
15e7ebdee0 update gitignore
add faithful texture packs
add options.txt
2020-07-29 00:27:46 +02:00
fa12897be0 update modpack.json 2020-07-28 23:52:03 +02:00
63d1b44620 update readme 2020-07-28 23:46:52 +02:00

Diff content is not available