Commit Graph
4634 Commits
Author SHA1 Message Date
sandtechnology d753df2cf7 #550 Fix a NPE when disable update checker
Former-commit-id: 563671e4917911ae0b641c0996290a264c70a0db
2020-08-17 12:13:31 +08:00
Ghost_chu d26ea49afa Merge pull request #547 from Ghost-chu/release
Merge

Former-commit-id: 51b1babd4d6b1134e73a118f49a2c3e932328c12
2020-08-15 09:19:23 +08:00
Ghost_chu 49a7793927 Merge pull request #546 from Ghost-chu/master
Ready for release

Former-commit-id: e50eb9ca3231d63ec023dc062a68b25aeb340f96
2020-08-15 09:17:56 +08:00
Ghost_chu ca3b962b2f 4.0.4.8
Former-commit-id: 0fafcb191d0e01d839ee3d781b8df313b32b457c
2020-08-15 00:06:28 +08:00
Ghost_chu 75a5603ca4 Bug fix
Former-commit-id: aee8016b17d570c4a17188d1889b719d1eae409d
2020-08-14 21:45:08 +08:00
Ghost_chu fd272d94d1 Allow WorldGuard hot reload
Former-commit-id: fdd74345fdac4ce0f5c8389c428dfb1a7f508261
2020-08-14 21:37:10 +08:00
Ghost_chu 3e42e84d56 Merge remote-tracking branch 'origin/master'
Former-commit-id: 5d8be47a228764971cab01a347357aaa4f8ee399
2020-08-14 21:28:13 +08:00
Ghost_chu 041f9ad8a0 Add "OWN" and "any-owner" for WG checking
Former-commit-id: 5ef670b1a71272fbb44c0946edafc7d72249b28a
2020-08-14 21:28:00 +08:00
Ghost_chu a1045e9f58 Update plugin.yml
Former-commit-id: 0178e58fcbc8650208646f12b195664b45f4a38d
2020-08-14 01:53:21 +08:00
Ghost_chu f4adac773c Update LICENSE FROM BCS TO PCS
Former-commit-id: 912880ef326d0aa31ca01cbed6920fcea0be4ae8
2020-08-13 20:17:52 +08:00
Ghost_chu d3170514fb Allow re-register command container
Former-commit-id: ab53861b2d13b619dc0a4729f1811c986411bd17
2020-08-13 15:45:30 +08:00
Ghost_chu 4047ec5289 Merge pull request #545 from Ghost-chu/master
Release hotfix

Former-commit-id: c3a2ebf46a31e074b67bd44276dbd4088d9c39ac
2020-08-13 13:50:31 +08:00
Ghost_chu 18775f37dc Merge remote-tracking branch 'origin/master'
Former-commit-id: c11f5bfe2757d88621b3fb16b9994c48f1fb2d55
2020-08-13 13:49:57 +08:00
Ghost_chu f363010723 Merge pull request #544 from Ghost-chu/release
Release

Former-commit-id: 2f4d5d72cef34f6d5a36cf2cae416a96a0cc9efe
2020-08-13 13:49:37 +08:00
Ghost_chu 1501a49701 Fix server thread blocking issue
Former-commit-id: dcfe9b14d5763bc87b4769e7c271139cdc9bc7b2
2020-08-13 13:49:23 +08:00
Ghost_chu 706b4d032f Merge pull request #542 from Ghost-chu/master
Ready for release

Former-commit-id: 18a98a12485fcdb2ba03638ed52486eaf785c252
2020-08-13 13:06:51 +08:00
Ghost_chu 70ec37cb51 Merge pull request #543 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: 2ab272aa636e7a1d20df151b64396cc60afefe38
2020-08-13 12:23:41 +08:00
Ghost_chu 68adeb0aab Merge remote-tracking branch 'origin/master'
Former-commit-id: c574e9aed38306b64804e9a2ecf2047520b83e95
2020-08-13 11:45:30 +08:00
Ghost_chu ef3c174f83 Migrate to Jenkins Updater
Former-commit-id: 3e6c516aa96c1cbc33133fe366affcb716a5ecdc
2020-08-13 11:45:19 +08:00
sandtechnology 1523c5fb4f Merge remote-tracking branch 'origin/master'
Former-commit-id: 108a546c33d0bc488cc9ee52a7b7c05368b0f63e
2020-08-13 01:15:39 +08:00
sandtechnology 17f56dfc05 #539 Fix a typo which causing not matching books
Former-commit-id: 9378ef5f3313b8e9d0e872283dc7f6bb2c256c05
2020-08-13 01:15:10 +08:00
Ghost_chu 66eb181839 New translations messages.json (Chinese Simplified)
Former-commit-id: af898c5ff0b28fee563efc319646e90f983e819f
2020-08-13 00:59:17 +08:00
Ghost_chu f987a5c849 Ready for release
Former-commit-id: c8b13e0b55a1277f1e836acf3555ed2244f477f0
2020-08-12 21:47:22 +08:00
Ghost_chu d86a89317b Apply protection checking blacklist.
Former-commit-id: 557e9d3ded89b9d2573f802d3b603a5f3e450d6e
2020-08-12 21:46:13 +08:00
Ghost_chu a5e32ba1df Allow disable the protection checking in some worlds
Former-commit-id: 11838599112c42b189f27272aa6c29076f7458f2
2020-08-12 21:43:58 +08:00
Ghost_chu 6d5c23dcc2 Told user shop may won't save to database
Former-commit-id: 42d8bf70dbe25e79e84966887cca902a509d1d45
2020-08-12 21:01:57 +08:00
Ghost_chu daf12860ea Fix the "delete(true)" and disallow ShopLoader to delete the shop
Former-commit-id: 6547be8913f204cb8701ccec54e12ca69e4f1ad0
2020-08-12 20:58:42 +08:00
Ghost_chu 173ab10f82 Merge remote-tracking branch 'origin/master'
Former-commit-id: 10105de88fabbf481b76aea9100bd75591c02284
2020-08-12 18:21:50 +08:00
Ghost_chu facc257891 Fix paste NPE issue
Former-commit-id: ad9c378871c8ccd91b18d0b5d2517bb91d69c26c
2020-08-12 16:43:35 +08:00
sandtechnology fea4c60205 Merge remote-tracking branch 'origin/master'
Former-commit-id: fe55d6fdac356faf136913eeae097d0e389516f4
2020-08-12 02:19:51 +08:00
sandtechnology 5df889d180 Hopefully it will fix shop disappearing issue
Former-commit-id: 940362c44c742a259246368df8ffcb047209498d
2020-08-12 02:15:55 +08:00
Ghost_chu 03f6adc3f3 Tracing the shop deletion in shop log when debug.shop-deletion is true
Former-commit-id: 90c1080305de36ed51bf49a7075d2551294307c4
2020-08-08 20:54:11 +08:00
sandtechnology e6c015959f Fix #535
Former-commit-id: 290d67d631b4a88de48c9128c1a72720188515c0
2020-08-07 20:21:16 +08:00
sandtechnology f818c5b21e Merge remote-tracking branch 'origin/master'
Former-commit-id: 551a5123048f121bd8ac961f301dcfea6d743603
2020-08-06 12:25:09 +08:00
sandtechnology ca041d5433 Only replace [PROTECTED] in config.yml
Former-commit-id: 6a18d7e6ec197cd122aa906264991a65703b9ca3
2020-08-06 12:24:47 +08:00
Ghost_chu 151f31be41 Improve the updater
Former-commit-id: 6c308a8b40d808ad6e865d2d794564281f7a1573
2020-08-05 20:34:51 +08:00
Ghost_chu fa2c1f1739 Merge pull request #534 from Ghost-chu/master
Ready for release

Former-commit-id: a30d9e7522c8a91b2a737de70732e7008a8469e6
2020-08-05 20:10:58 +08:00
Ghost_chu ce3318fa38 4.0.4.5
Former-commit-id: 948441f27f9f6b8c37a04e15e2a16d4718c75d15
2020-08-05 20:10:13 +08:00
Ghost_chu 2f9bb0f022 Poi
Former-commit-id: 4514a67ef8ba14dfbc3967cefc35f71e161bd4a7
2020-08-05 20:08:28 +08:00
sandtechnology 1853944a39 Update for tax account introduction
Former-commit-id: dc0fbe5f497c810bcb4a054b3cfa563f021260ed
2020-08-05 13:15:14 +08:00
sandtechnology 1a762c7616 Merge remote-tracking branch 'origin/master'
Former-commit-id: 7df378f17a6276317b8d64ce6e7c89d7f8bb2a00
2020-08-05 13:10:44 +08:00
sandtechnology 799182ffd5 Allow disabling tax account by set it to empty
Former-commit-id: e710760ba239233f4f021e8fec247085ed589f96
2020-08-05 13:09:44 +08:00
Ghost_chu c9d721a7a7 Merge pull request #532 from Ghost-chu/Ghost-chu-patch-1
Tax never should failed.

Former-commit-id: 50db780a13a8afebad107b8ccb3b10d40b83b10e
2020-08-05 12:24:53 +08:00
Ghost_chu d18d3e3aa4 Tax never should failed.
Former-commit-id: 0d59ec929f5c9050b6f1a60a089368c0693dc2ce
2020-08-05 10:38:05 +08:00
sandtechnology fe931ac444 Merge remote-tracking branch 'origin/master'
Former-commit-id: 08c15e063f60ace9e7fb6e9261295232981f0090
2020-08-05 00:18:49 +08:00
sandtechnology e019a3e13f Ignore tax account deposit when tax is 0
Former-commit-id: a75e0123b63ee814633a33a276830c3a3a6cd0cf
2020-08-04 22:47:41 +08:00
sandtechnology e75c41b62e Merge pull request #531 from Ghost-chu/master
A quick tax display fix release

Former-commit-id: 3f28702547001e3f2dd7c61fe1928b7b02ad9c87
2020-08-04 15:40:26 +08:00
sandtechnology d4d3d91725 Merge pull request #530 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: cfbf731ef675a949e0ddc38e6f68d76eb17dcbe6
2020-08-04 15:39:21 +08:00
sandtechnology 1e402a9e7b 4.0.4.4
Former-commit-id: 0e29dac87ad24220e75ab72dfd1ec44dfbfed945
2020-08-04 15:37:52 +08:00
sandtechnology 2c54a2a581 Fix wrong tax display
Former-commit-id: bb21f3ff7c619b6e539301dd12aaeda1eadeda4e
2020-08-04 15:20:43 +08:00