Commit Graph

60 Commits

Author SHA1 Message Date
Apehum
900bcb43c3 Upstream (Pufferfish) 2022-07-28 20:33:37 +08:00
Apehum
902afb9e5b Upstream (Pufferfish) 2022-07-23 16:44:53 +08:00
Apehum
6eb92dc95b Upstream (Pufferfish) 2022-07-18 20:29:13 +08:00
Apehum
c1ecdbdd60 Upstream (Pufferfish) 2022-07-05 08:50:00 +08:00
Apehum
a6085aa23d Upstream (Pufferfish) 2022-07-03 08:55:20 +08:00
Apehum
ec4f50f8ce Upstream (Pufferfish) 2022-06-27 06:11:39 +08:00
Apehum
c013f3a0f8 Upstream (Pufferfish) 2022-06-21 21:30:55 +08:00
Apehum
9762e3fe5a Upstream (Pufferfish) 2022-06-19 00:14:33 +08:00
Apehum
c77fa2c274 Upstream (Pufferfish) 2022-06-16 02:20:33 +08:00
Apehum
9eb1df6aff Update github and jenkins url 2022-06-14 21:45:12 +08:00
Apehum
cf08ab192b Update to 1.19
caution: version not fully compatible with 1.18, structure locations are same but generation is different (it won't be fixed, so upgrade on your own risk)
2022-06-14 20:34:10 +08:00
Apehum
6358c83d0a Merge pull request #6 from plasmoapp/ver/pufferfish-1.18.2
Upstream (Pufferfish)
2022-05-10 15:54:07 +08:00
Apehum
7e391d3fd1 Upstream (Pufferfish) 2022-05-09 18:34:40 +08:00
Apehum
c6f98979b2 Merge pull request #5 from plasmoapp/ver/pufferfish-1.18.2
Upstream (Pufferfish)
2022-05-04 12:03:03 +03:00
Apehum
e4370fca1b Upstream (Pufferfish) 2022-05-04 16:35:46 +08:00
Apehum
a86a85850c Merge pull request #4 from plasmoapp/ver/pufferfish-1.18.2
Fix lectern quick move (pufferfish not updated yet)
2022-04-05 08:40:07 +03:00
Apehum
324c5853a4 Fix lectern quick move (pufferfish not updated yet) 2022-04-05 13:38:23 +08:00
Apehum
7d4587a6c6 Merge pull request #3 from plasmoapp/ver/pufferfish-1.18.2
Upstream (Pufferfish)
2022-03-28 16:04:40 +03:00
Apehum
1ff9060996 Upstream (Pufferfish) 2022-03-28 20:49:31 +08:00
Apehum
ee211146bf Merge pull request #2 from plasmoapp/ver/pufferfish-1.18.2
Update to 1.18.2
2022-03-21 22:45:07 +03:00
Apehum
8fe28873c6 Upstream (Pufferfish) 2022-03-22 02:58:46 +08:00
Apehum
1e27754941 Update to 1.18.2 2022-03-22 02:33:58 +08:00
Apehum
a0d0d1a2c8 Upstream (Pufferfish) 2022-02-23 22:29:48 +08:00
Apehum
dd2637db6c Upstream (Pufferfish) 2022-02-14 20:14:21 +08:00
Apehum
6e492dc864 Upstream (Pufferfish) 2022-01-30 16:27:16 +08:00
Apehum
21732dd3fe Upstream (Pufferfish) 2022-01-23 18:56:06 +08:00
Apehum
4b0072a5a0 Upstream (Pufferfish) 2022-01-17 16:57:13 +08:00
Apehum
2f9478c0ee Upstream (Pufferfish) 2022-01-12 16:28:13 +08:00
Apehum
afd47c4d06 Upstream (Pufferfish) 2022-01-08 14:26:45 +08:00
Apehum
0cde6c1c22 Fixed a bug with fortress always generating on the bastion 2022-01-05 17:28:55 +08:00
Apehum
7fbfc0df3e Upstream (Pufferfish) 2022-01-04 19:45:56 +08:00
Apehum
3a4edea725 Fixed patch issues 2022-01-01 20:39:05 +08:00
Apehum
bd382d7c31 Upstream (Pufferfish) 2021-12-31 17:42:10 +08:00
Apehum
fbb096f90a Upstream (Pufferfish) 2021-12-21 00:28:25 +08:00
Apehum
cc1e8857f0 Upstream (Pufferfish) 2021-12-18 23:39:49 +08:00
Apehum
de1d5324ef Add jitpack to repos 2021-12-16 05:31:45 +08:00
Apehum
b6a3a1cee5 Update github branch in version fetcher 2021-12-16 05:11:22 +08:00
Apehum
7900daa9ae Use Pufferfish upstream
Move branding to separate patch
Move metrics to separate patch
Move /seed command to separate patch
2021-12-16 04:27:10 +08:00
Apehum
9560955c42 Use purpur purstream
Move branding to separate patch
Move metrics to separate patch
Move /seed command to separate patch
2021-12-16 01:16:35 +08:00
Apehum
2a2b5adbf8 upstream 2021-12-15 04:47:11 +08:00
Apehum
60ad1c6f0f update paperweight to 1.3.2 & upstream 2021-12-15 04:41:04 +08:00
Apehum
443f65786f upstream 2021-12-15 04:01:09 +08:00
Apehum
a01723713e upstream 2021-12-10 18:43:39 +08:00
Apehum
b5de06e314 Merge remote-tracking branch 'origin/master' 2021-12-10 04:00:01 +08:00
Apehum
06895d1b53 upstream 2021-12-10 03:59:25 +08:00
Apehum
20901790be Merge pull request #1 from byquanton/master
chmod +x gradlew
2021-12-10 00:03:03 +08:00
byquanton
0fe40c941d chmod +x gradlew 2021-12-09 16:57:05 +01:00
KPidS
0ac4091509 [ci-skip] Update readme.md 2021-12-09 17:41:44 +02:00
KPidS
7d90f71c0f [ci-skip] Update readme.md 2021-12-09 17:35:08 +02:00
Apehum
f036075b27 API version fix 2021-12-09 23:23:46 +08:00