portlek
35a3568dcd
Update JSONFileTest.java
...
Former-commit-id: 9b87d720086f93c538277d8b21e148c2c221b6a8
2019-12-12 16:18:38 +03:00
portlek
b7b1d7cbaa
tests
...
Former-commit-id: 525822770b1b4ca0de9e19995f65d788dee4c05a
2019-12-12 16:15:59 +03:00
portlek
b6ab45a84a
Update JSONFileTest.java
...
Former-commit-id: 160ae777ef63530341e90ef04499bc17de4fed04
2019-12-12 16:07:06 +03:00
portlek
d724fd038d
Merge remote-tracking branch 'upstream/master' into json-yaml-xml
...
Former-commit-id: 40ac2c2983bc4dc6379e327744cf3cb6531c24a7
2019-12-12 16:06:10 +03:00
portlek
4fb7da5969
test
...
Former-commit-id: edc413983531f70cae15f0b2a561c837e8719f99
2019-12-12 16:04:22 +03:00
Ghost_chu
76b06adb50
Add 7667[1.15] on bukkitdev site version number to auto-upload script
...
Former-commit-id: 2a7d5e1b4f9bb4d1def8e44a53648ed5b515fb3c
2019-12-12 21:02:51 +08:00
portlek
197f59f6ee
Update pom.xml
...
Former-commit-id: 58ef03ca2cf83cea492896c16f4cc0cfbca35411
2019-12-12 15:54:52 +03:00
portlek
abf85cf960
update classes
...
Former-commit-id: b990d7d5428f011a2e4b5260a6540405e4ec24c1
2019-12-12 15:54:28 +03:00
Ghost_chu
866f34beea
Remove useless providers
...
Former-commit-id: e080451f57ceb127529b76bc53275a06ffe0905d
2019-12-12 19:08:56 +08:00
Ghost_chu
88a32cada1
flush repo infos
...
Former-commit-id: 6913155fd6199901b027ff669bcb925aff3368ed
2019-12-12 19:05:40 +08:00
Ghost_chu
5050d53b27
Remove useless depends
...
Former-commit-id: 918636aed76b4f3d95c7a509c23301ac729d8977
Former-commit-id: 7bb4ebd60668dad1ef00991455de6b55d8e252d3
2019-12-12 18:44:59 +08:00
Ghost_chu
aba811edaa
typo fix
...
Former-commit-id: 05a95c9877adee87138bc1eaa41acd0db4a9af10
Former-commit-id: 14d8a221c0a94f8026ce20d4703f54174683addd
2019-12-12 16:30:32 +08:00
Ghost_chu
680c781672
Config helper to help user find where is broken in config.yml and tell user how fix it / let user use auto-config-fixer.
...
Example:
[QuickShop] Missing options in config.yml, the key [shop-blocks] not exist in config.yml, it may cause plugin errors, please fix it! There is guide for you to fix:
.....
shop-blocks: [CHEST, TRAPPED_CHEST, ENDER_CHEST]
.....
Former-commit-id: 3160aa0abf28e54e778fbdb4bfe1439d84bde68f
Former-commit-id: 2619d9cf1eecb44ccf23022f4874df0729fae303
2019-12-12 16:27:43 +08:00
Ghost_chu
5bc0625eba
Force remove the entites, fuck away check.
...
Former-commit-id: 906f35aa1dd14ce0d62aa1e75733ea341073ba77
Former-commit-id: 220b4793aeafb1d033365ea8e2e2786b852e3aae
2019-12-12 15:28:23 +08:00
Ghost_chu
bdbcc50494
Code cleanup
...
Former-commit-id: 10726ad0830d0dc44a52ff66fc4aa3b539f5fb77
Former-commit-id: c6e9b1113f3d0dc605c20d272c3f22a99067777e
2019-12-12 15:24:43 +08:00
Ghost_chu
f2c606c811
Code cleanup
...
Former-commit-id: cca1c3dc1449049fa9e416b03b30cbac3e21f438
Former-commit-id: 42ebe78012b208971120659cf8cb00f2fe5cc47c
2019-12-12 15:18:27 +08:00
Ghost_chu
17f24acbd1
Fix ClassCastException
...
Former-commit-id: a4fc8e63af7194383e848b79aba7c93a77ed032f
Former-commit-id: 7df5b1885ca0755603e082d5aace4e017a5b9cb3
2019-12-12 15:18:09 +08:00
Ghost_chu
c438ff8b7e
Cleanup code
...
Former-commit-id: 0cc69c1449af5fa6de93c9ca57b93ee1e2dd87c7
Former-commit-id: 16e91d0cfbd521e249e3125dca7bc64ab159ceec
2019-12-12 15:12:16 +08:00
Ghost_chu
1b565feff4
Code cleanup
...
Former-commit-id: 42b801b371bbadc235e5517bc27d20a4cb5abe15
Former-commit-id: c179d5721b60d4a87f6258d8962f139cc93201ad
2019-12-12 15:11:54 +08:00
Ghost_chu
7ea44312c3
Fix build error
...
Former-commit-id: c00f5a61506663537cc9c9c0dbd6a55d24b21c5a
Former-commit-id: 3299d2e9382275f262c51d0fb64433515fb87cb0
2019-12-12 14:46:26 +08:00
Ghost_chu
ecc60e867a
No 5000, just 500
...
Former-commit-id: d755ea48caa7811173e3edacbb61d33bd84383a2
Former-commit-id: 90720c1ac8b38120db699e28799bb79572019f97
2019-12-12 14:41:33 +08:00
Ghost_chu
47a1a2813e
EngineHub paster support, add some useful utils grab from other project
...
Former-commit-id: 5617cf827e1e0915ef301105023d4d7dc3a5327f
Former-commit-id: 8f231aeb7ef9c6514d494d51121430b0ac6e3c0f
2019-12-12 14:37:25 +08:00
Ghost_chu
fb1f996c99
1.15 Ready
...
Former-commit-id: 4149f6f4d9e96d912012ab6f9a70a7108563aefa [formerly 8c351f42f6ff31e0776f3bb9288edec7635bd274]
Former-commit-id: aaa59e75dfec9636bf9efea243397c0a31e9a287
2019-12-12 10:56:03 +08:00
Ghost_chu
bd030a04f7
Fix #237
...
Former-commit-id: 3bbebcd2a1a7cefa71b16d69192f00fd4cdde89d [formerly 0c60b1f3df22c01380c633e896972ad2e1af32cf]
Former-commit-id: 332aa20702b76ecd6edbf5397e8412d25f9492a9
2019-12-12 10:24:23 +08:00
Ghost_chu
27acbebdc7
Fix #239
...
Former-commit-id: f16d6057267da3746a11b139c79ae3b1298aebf0 [formerly 376676ef27d69e26c42d1c2e0c6dc349ffdd550e]
Former-commit-id: 7fd26f1ffea6ed1e21cd64cb87ed9873619e9671
2019-12-12 10:15:38 +08:00
Ghost_chu
d37171f1e0
Add a mark to ArmorStandDisplay to allow owner remove the bad armorStand.
...
Former-commit-id: f2f7067266e97bd9f2876bdd4c158464bee24aa6 [formerly f385f3dd5f2ff2b5be672125fe2a10eda2edc62b]
Former-commit-id: 68752a127ae84387984b175cdcb243f20bfacff1
2019-12-12 10:08:10 +08:00
Ghost_chu
72df1eb181
Remove stupid line border for stored enchantment.
...
Former-commit-id: a3e5c61638a1cf59d77a05ac4de49a870b878c89 [formerly a841eb8b401aacd51b52f68083eacdfc6c327629]
Former-commit-id: 771092a5beb2130237888c5a3265cd7aed362e55
2019-12-12 09:42:56 +08:00
Ghost_chu
088114a39c
Add sponge enhance protection
...
Former-commit-id: a9f295bfac290e722f1605e2ff30705e6879b025 [formerly 9824fa2efd2d5e29fae2e545a8e848a417921c56]
Former-commit-id: 22fe5185334dbae0337bf0898bd37c3fd3222902
2019-12-12 09:41:59 +08:00
Ghost_chu
1463c22655
Fix #240 again.
...
Former-commit-id: a60e145ecd7e983c52c33616da1281d54ea8af2b [formerly e56cbd88f5e9a495317390001bd9af1960c4e32d]
Former-commit-id: 920bc97b7130799e75a2034295f011bdb5d1b3f7
2019-12-12 09:33:15 +08:00
Ghost_chu
9f27165aea
Fix storedenchant chat message only right half line was printed.
...
Former-commit-id: 6382b2b9615ebbc23b614da765333e08c7cc9654 [formerly 05c52cf56e4790767bc660b0359fb5369df4b2a4]
Former-commit-id: 313d4343fc11dc1f5fb56d84f94f4eb996dbdc13
2019-12-12 09:32:06 +08:00
Ghost_chu
6bb203e971
bump 1.15
...
Former-commit-id: 24b0af8de094668f944ff189f94e15161ba69366 [formerly beb33785ca180b4acd28bfdcce66ba85b1b198d8]
Former-commit-id: e10b26eeb70296b779944bf425604d40de3a1115
2019-12-12 09:06:40 +08:00
Ghost_chu
79a0bcb9fe
Merge remote-tracking branch 'origin/master'
...
Former-commit-id: 60f0c76ff024c92f4e87823206a3f65e5de25002 [formerly fb5c6b9641e2b2b3921c6b06232a4b8436a33055]
Former-commit-id: 43b0c374528168c59e450098549b92b16c61de2d
2019-12-12 09:00:37 +08:00
Ghost_chu
1446954342
Fix #247
...
Former-commit-id: 995512477dc10f8d2da53f2847b798d95c9bf687 [formerly eccf74cce43e53a21968a216d721cb38936aee8e]
Former-commit-id: aa18ff21e68204efee04ea607154e8afe9bf5f66
2019-12-12 09:00:12 +08:00
Ghost_chu
ff708ea73f
Merge pull request #244 from portlek/decimalfix
...
Fix decimal format bug
Former-commit-id: 67b90f0c24b2a0f5de6f41173d693909596781ae [formerly a4f0ce15c4d5ce67ea3d19c93cb50abed564497f]
Former-commit-id: 974d2ecbb351e906a26f254e6f381b27feb3d4bd
2019-12-11 13:27:40 +08:00
portlek
da41de8c2a
fix paths
...
Former-commit-id: d24d7e0b9898e7fa22fe861e820dc7474936aaa1 [formerly 0106af3499c3698678eb251eb9fcb38e4b9b5bcb]
Former-commit-id: 97256e429a9208ce3966c5c885c94fbbf17ce2b5
2019-12-10 14:46:38 +03:00
Ghost_chu
b9d4a1a0cc
Merge pull request #238 from portlek/fixeconomy
...
Fix economy console spam bug
Former-commit-id: a3598069c095f628bb5c9723fc66fc9edef619b5 [formerly e25b4b6afeca77d523089d3234f9253309cfb52f]
Former-commit-id: 0ae4ae9d6daa9a1b8a809147be0a446bd055bea7
2019-12-09 11:28:56 +08:00
portlek
54f12410e4
Merge remote-tracking branch 'upstream/master' into fixeconomy
...
Former-commit-id: c138138ae75dfd2eb365ebfbbfa3791b6e150acb [formerly 862c98483d2bef0ddb6b2f799719c2ff1773a928]
Former-commit-id: f8cd4772d2d46896fe9a93add1cbdc32c4f310d1
2019-12-05 13:43:23 +03:00
Ghost_chu
b27afe3d38
Don't clone the clone object
...
Former-commit-id: 7cc0036716cada9f19c6d9b1adb8c7f99cb101b8 [formerly 904f1a4c0019d80f21764b39ff73ecbedd9b0847]
Former-commit-id: c14fa63cdb840f5dd825d69657467482f0db75c9
2019-12-05 11:26:38 +08:00
portlek
9793f39d4a
fix economy console spam bug
...
Former-commit-id: 7af1334555f4ce714acbd3c4cec3e5eef3792599 [formerly 278820e817260e21cf00405387bd2c57242acb4f]
Former-commit-id: 9b43255f00559cc8b7857ea6f5ea62b5af8856cc
2019-12-01 19:56:03 +03:00
Ghost_chu
a320f08ae1
Merge
...
Former-commit-id: 2cc65dac665bfe931209f6de33708dbe66474808 [formerly 830a7598bdd2f381e082fbd884ff904928fb029d]
Former-commit-id: c70bf7fc43831e52a7aba7dd18917b201a9d1633
2019-12-01 10:19:52 +08:00
Ghost_chu
0c1d0ba8ab
Revert "Add ToString support"
...
This reverts commit 34772ea4
Former-commit-id: 32f7b8f9b8dc95e1b591d9a7da3c2433474b9171 [formerly ebe51067ca870316a49f15956c109180cdd55b36]
Former-commit-id: 700f4d19ccaec02e890c380a5abc15d11a253626
2019-12-01 10:18:50 +08:00
Ghost_chu
68465027e2
Revert "Webhook support"
...
This reverts commit 4f330ed2
Former-commit-id: 5b466dfd4591da025c626168d0264220ae77107d [formerly 26d1a75769c86c6dc68c15d83df86a577ba6b0a2]
Former-commit-id: f3a9f9ca3af646d274a989a20e568755736af788
2019-12-01 10:18:30 +08:00
Ghost_chu
8a3367fbec
Revert "Apply webhook for some events"
...
This reverts commit 70e0e458
Former-commit-id: 6b525f2f6e71ab55eaa498e5c5c401cf3d0b9461 [formerly 905bed5713f8902adc3e8ce91c04673c99a00348]
Former-commit-id: bfd717b77365607a5050b2a885b4f2d85f83aba9
2019-12-01 10:17:50 +08:00
Ghost_chu
5fd231624f
2.4.8.6
...
Former-commit-id: 87803e08de5e1758bbac48724fc7fb91dac52df8 [formerly 4824728fe8f8a2352c6666edd809edd3d7655d04]
Former-commit-id: da46f2be052f3b54d32c8d2812400613db606ad9
2019-12-01 08:56:58 +08:00
Ghost_chu
ef39a03f9a
Revert "Add AsyncDetector util."
...
This reverts commit 42f868a9
Former-commit-id: b84e7357be9c8333c3aa9d244bd6c4b2de37818e [formerly e22c8edfe2097d801568e2d5dc0249b633b8bc9a]
Former-commit-id: 837665c221d3ca66859caa977ba905de79c6a94d
2019-12-01 08:56:34 +08:00
Ghost_chu
415e633d96
Revert "Add async detect for display check"
...
This reverts commit 47130e2f
Former-commit-id: 46de5da99e801ad14720ec247ec565443a5ce2b8 [formerly 9dfd6b3326e6fdc06db19da87dc26e0e8a08c78f]
Former-commit-id: 8bfd3472e32223437baaf57490f5bce5020e6aa8
2019-12-01 08:56:29 +08:00
Ghost_chu
d411673879
Revert "Execute display check task async, display already add async detector."
...
This reverts commit 2f40d59e
Former-commit-id: efc5fec2e300f5c41c70d20a23f6b159e9902ae0 [formerly 5961a558698a7cf548c9f11b3c9c33fe2df64f9b]
Former-commit-id: 762d19c1e4192684f7f3f92691e15eeffbddc2ef
2019-12-01 08:56:20 +08:00
Ghost_chu
2b726d8d0c
Revert "Better way to check async, dev can call it on sync thread or async thread. Didn't think it should run in BukkitRunnable."
...
This reverts commit 558ade46
Former-commit-id: 14d7a16367007cf3cd12f60a9402c63fad1d84d0 [formerly 429b046981c899196e6805ebca9bd42340986b8d]
Former-commit-id: 007315f1922f4f7e0fb9129340979dde976853ec
2019-12-01 08:56:13 +08:00
Ghost_chu
2c946a1c9b
Move some method to useEnhanceProtection.
...
Former-commit-id: 38aeb01222a9f040ea72292e8631d295c48b3111 [formerly 6f9799ae2989ae8a826e3cf83367bc34a74a50b9]
Former-commit-id: daa1dc475bae61065fca64fd2289e71e1f5fa41a
2019-11-30 21:26:38 +08:00
Ghost_chu
56e9054407
Merge branch 'master' of D:\Code Workspace\Java\QuickShop-Reremake with conflicts.
...
Former-commit-id: 24859b57f3f899044aa1e11e70db5ee76ecc4780 [formerly 9e74dfdad5840989f04de2745622c196f99900c9]
Former-commit-id: 5e6e42d9b978612803b3eafbb3d093acf2e6e95a
2019-11-30 21:25:03 +08:00