Commit Graph
4056 Commits
Author SHA1 Message Date
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 18775f37dc Merge remote-tracking branch 'origin/master'
Former-commit-id: c11f5bfe2757d88621b3fb16b9994c48f1fb2d55
2020-08-13 13:49:57 +08:00
Ghost_chu 1501a49701 Fix server thread blocking issue
Former-commit-id: dcfe9b14d5763bc87b4769e7c271139cdc9bc7b2
2020-08-13 13:49:23 +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 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 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 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 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 2c54a2a581 Fix wrong tax display
Former-commit-id: bb21f3ff7c619b6e539301dd12aaeda1eadeda4e
2020-08-04 15:20:43 +08:00
Ghost_chu 435cc9a6ae New translations messages.json (Dutch)
Former-commit-id: 40e8a56497833018bb2005dd99c379a513c6a765
2020-08-04 14:08:15 +08:00
Ghost_chu 1c5c6e6a85 New translations messages.json (Dutch)
Former-commit-id: 78a54692447e8dbd506be99307d914d8925e5c58
2020-08-04 13:55:15 +08:00
Ghost_chu 0ea4d27b1f New translations messages.json (Dutch)
Former-commit-id: 5b3f5f287c0ee18705c74814d8a7b4643bbc373f
2020-08-04 13:45:03 +08:00
sandtechnology c266e04518 Making code more readable
Former-commit-id: 1279b397673118bb21a138920b11224378940814
2020-08-04 13:21:13 +08:00
sandtechnology 2b9579c25f Delete debug code
Former-commit-id: 0f465e0c883c9ad577d9234bccf2e9911c5860f1
2020-08-04 13:15:42 +08:00
sandtechnology 5b1c0ba835 Merge remote-tracking branch 'origin/master'
Former-commit-id: e2501ea5b8cf1d49229d05cdfad8624091766d5d
2020-08-04 13:12:56 +08:00
sandtechnology 8f7a0774cb Fix #528
Former-commit-id: ad43e06c0fcb123cf6337bda9c6d9c4c7172466c
2020-08-04 13:11:50 +08:00
Ghost_chu 95adef407f Remove POM Version from BuildInfo
Former-commit-id: 3e7db1ebe2f60db07109b0475c73be94deeef7b7
2020-08-03 21:55:37 +08:00
sandtechnology 508d6e34c4 Add Null Test
Former-commit-id: b2704492be688f91b14b8549987d502e80cc7f41
2020-08-03 20:22:20 +08:00
sandtechnology 628a878294 commit when close the connection
Former-commit-id: e9e78508f3c091eec0400488a68d2a65f5d5136d
2020-08-03 20:14:15 +08:00
sandtechnology 427afd29be Try to fix shop missing problem
Former-commit-id: 2389865fad7d5d075c280bb0ef78a633ebd66eae
2020-08-03 19:59:33 +08:00
sandtechnology eda7355c68 Improve shop log in qs.log and fix typo, thanks to @Bloodlex
Former-commit-id: 1b4b97e81ac58d9da34802b3938954ca4b489d70
2020-08-03 01:30:55 +08:00
sandtechnology b26e8ebc1c Add Owner balance logging in qs.log
Former-commit-id: 2ad96785ec183c790d065e862c08e51f3923fa6a
2020-08-02 22:38:40 +08:00