Commit Graph
2182 Commits
Author SHA1 Message Date
sandtechnology a72afa052d Fix CME and improve player check
Former-commit-id: da581f40d9094114a5c5c7044659d54170123bf0
2020-02-11 22:30:23 +08:00
sandtechnology 0ed84a050e Merge remote-tracking branch 'remotes/upstream/master'
Former-commit-id: e362d57af0eb522606d8e26c072e708362bbe744
2020-02-10 17:08:36 +08:00
sandtechnology cdf640267f use project basedir
Former-commit-id: 4ae23b7ae6a0eb34ccc32551175e4561daa078d9
2020-02-10 17:05:51 +08:00
Hasan Demirtaş 07dd30a17f Update .travis.yml
Former-commit-id: 39deddfeaa2ef9adb23615488ed0389ed52b4b0a
2020-02-10 11:50:31 +03:00
sandtechnology aef05c65cc Fix a bug caused by wrong config path
Former-commit-id: 94b958ce9d1d7fccf61e1b0e3229dfc3e0185175
2020-02-10 14:38:04 +08:00
sandtechnology ba293d9b2a Improve the way of getting nearby player
Former-commit-id: 8a3aa91f3b79a3e28f91ec2898549d7db27570a9
2020-02-10 14:18:33 +08:00
sandtechnology b7acc62f52 Remove useless code (it will called when the shop loaded)
Former-commit-id: d5de1e56c018cf8da585ea5d3d763ca0d2148f88
2020-02-10 14:00:24 +08:00
sandtechnology e891717beb Move listener code to constructor
Former-commit-id: 307aee6a0cf9ea4a26df131898be9a9bb6828f2a
2020-02-10 13:55:33 +08:00
sandtechnology 21afc4d4cf Fix a stupid bug
Former-commit-id: 906d9ce6a189e518aa73a7fd3c27c4537aad7960
2020-02-10 13:51:42 +08:00
sandtechnology 0ba98a43ed Detect the chunk is loaded to prevent rare bug
Former-commit-id: 475402a4f3f58e82ce09a26b1bf640949b216f5b
2020-02-10 13:43:43 +08:00
sandtechnology b98475e710 Fix a naming issue
Former-commit-id: 378c3979b7ec0e143c5377e99e583addf57ef49d
2020-02-10 12:55:42 +08:00
sandtechnology 1a79ac34d4 add license head
Former-commit-id: 42985a26381d6b777555a95b7258d34152cb816c
2020-02-10 12:43:09 +08:00
sandtechnology 4af8f40483 Implement VirtualDisplayItem
Former-commit-id: 5db70c0e3fac9a38518108f90feebe56d98f2b35
2020-02-10 12:30:31 +08:00
Ghost_chu 41db1f2317 Fix a bug in IntegrationHelper
Former-commit-id: 6240b599366e084f0a718e2577ced248294782c0
2020-02-09 23:39:57 +08:00
Ghost_chu 1f00fa2888 Remove useless code from repo
Former-commit-id: d1ee63824238a408b88e082215217f37f4cc9834
2020-02-08 18:11:17 +08:00
Ghost_chu da1d0b3378 Merge pull request #331 from Legoman99573/master
CatServer Support Clarification

Former-commit-id: b55d0b6a93edeb854bd148082f540429d8c7071f
2020-02-08 13:53:50 +08:00
Legoman99573 89fa6efec8 CatServer Support Clarification
Signed-off-by: Legoman99573 <christiasnwhead@gmail.com>

Former-commit-id: f8586f67b305f8bf34deb38225ffc8bb20b23222
2020-02-07 23:06:23 -06:00
Ghost_chu 2db47fd8fd Sleep 180000ms for CS, let them go Luohuayu edition.
Former-commit-id: a2c5791a3d159604dbdc21a51d57aebead779a2d
2020-02-08 12:11:09 +08:00
Ghost_chu 03360635ff Go away
Former-commit-id: cb81eef9912f335b5be9f827d36a4138611a1bd3
2020-02-08 12:08:58 +08:00
Ghost_chu f0d82f4c88 显式声明开源协议,尽管之前使用的是代码头部版权声明和POM
Former-commit-id: 80a8bd6988aef5ca0d4dba7bc9677f5e66b7f6fa
2020-02-08 12:05:17 +08:00
Ghost_chu 2908c66f11 Nope
Former-commit-id: 2caf353a5620bd3437c58df557ec2539c8caf0ff
2020-02-08 12:00:53 +08:00
Ghost_chu d82218ab1a Install the checker for modded server, fix /qs paste didn't works if boot failed
Former-commit-id: c77bceb1ea277d3df3b71c8a8ed88bce6c5d77fe
2020-02-08 11:57:39 +08:00
Ghost_chu cd512bd6b6 Fix spelling
Former-commit-id: aa4cc31c641146417e5ee01aa5690a39844286a6
2020-02-08 11:45:06 +08:00
Ghost_chu 8c407cf506 Update CatServer runtime check messages.
Former-commit-id: 3bdacb68f0c15a1b283ef67b8bb34539c938b4cd
2020-02-08 11:44:10 +08:00
Ghost_chu 184daa48e7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml


Former-commit-id: 5307e3875140ffe9c6ff48e05f2a15162b27e4f2
2020-02-07 22:55:32 +08:00
Ghost_chu 148c6615cb Add banner matcher
Former-commit-id: ab4a57a9e4677da6af5c923ddb941f05459f4b23
2020-02-07 22:55:08 +08:00
Ghost_chu 6cf975199f Fix the bug for display disappear (maybe)
Former-commit-id: f52cf97f152ee1c45bab2966312c1d15c82eda21
2020-02-07 22:48:22 +08:00
Ghost_chu c111536975 Update pom.xml
Former-commit-id: 4fc1b6891b451b93cbfc0f154472e705cce43b97
2020-02-06 23:57:05 +08:00
Ghost_chu d816eec724 Close #330
Fix on my phone with WebIDE

Former-commit-id: 6261f31b6811b69118569071701551feb658393b
2020-02-06 23:56:05 +08:00
Hasan Demirtaş 757f1cd5f6 Merge pull request #329 from cakoyo/patch-6
Fixes BlockState casting

Former-commit-id: 7b90780171c42c058eaf64844ce06ed5ef9c5ded
2020-02-06 18:53:06 +03:00
cakoyo e4450f48c0 Fixes BlockState casting
org.bukkit.block.Sign is a BlockState instead of CraftBlock.

Former-commit-id: 2c6122728042beb344613bf9c591794bccb55f8a
2020-02-06 22:43:05 +07:00
Ghost_chu 28b7289922 Fix map matches
Former-commit-id: 3f6e1ac4d321c181bd8a8c64e959d89963e1de1f
2020-02-06 19:18:19 +08:00
Ghost_chu 9f5442cae8 Optimize performance and default use fast algorithm
Former-commit-id: 0360082b22d2cf594e0242c07195b040fa7d8cf4
2020-02-06 19:08:30 +08:00
Ghost_chu 8a3ec6ebf6 3.1.3.12
Former-commit-id: 22af827fbd0d70819184abc8599687e503e0f539
2020-02-06 18:57:51 +08:00
Ghost_chu 510bc1e9d1 Set clone depth to 1
Former-commit-id: eec878616e986e2827f5216f5ea3d99285d913e2
2020-02-05 16:53:16 +08:00
Ghost_chu 21afad35ca Remove useless Minecraft repo
Former-commit-id: 662d58f44c14996b588439573143ca543ebcaf3d
2020-02-05 16:47:32 +08:00
Ghost_chu 2c4e11441a Remove patch
Former-commit-id: c229c82b2a7315d276ae48704718c04189e6fe43
2020-02-05 16:43:21 +08:00
Ghost_chu 645388e9aa Fix build error
Former-commit-id: 565f6f40c81faf0e8f2004c20ef85825d44504d4
2020-02-05 14:52:59 +08:00
Ghost_chu 079ca36096 3.1.3.11
Former-commit-id: f7ede6b162ae436a0cdd9019ed24fc2b80ba57cd
2020-02-05 14:51:21 +08:00
Ghost_chu 9283ba9d4a Update bstats
Former-commit-id: 18a2fab7333b135a67ea94fb43afded1b06b3cee
2020-02-05 14:49:54 +08:00
Ghost_chu 50e725c538 Do checks for books
Former-commit-id: feb9456b265127c2e549ad4ab3d2f1bfcdc4eb69
2020-02-04 10:57:26 +08:00
Ghost_chu 77b595dc92 10
Former-commit-id: 468492231a8b88edf2ac75c1c52d88be08277967
2020-02-03 13:33:07 +08:00
Ghost_chu 4b0f28a523 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/org/maxgamer/quickshop/Util/Util.java


Former-commit-id: f8b34b97a96b6ff1e1671a6509087cb0d70fb337
2020-02-03 13:29:08 +08:00
Ghost_chu 5229c86db4 Update languages
Former-commit-id: e87d9314fbbe2bd80c6c426d311e066807f1e016
2020-02-03 13:28:22 +08:00
Ghost_chu d2f1b41e20 Update languages
Former-commit-id: 38ef5ca5dd614653dfa2e5546bb026882982337e
2020-02-03 13:27:17 +08:00
Ghost_chu f871597760 Fix bug for /qs staff
Former-commit-id: 6fe36f470cb9acb897a4b15509f4982322d7ce5b
2020-02-03 13:26:50 +08:00
Ghost_chu 249131c202 Merge pull request #324 from cakoyo/patch-3
Fixes array2String, Close GH-323

Former-commit-id: a16217e3e494713e0d668ead1481c4b6ac688bad
2020-01-31 23:38:02 +08:00
cakoyo 0a2b82b031 Fixes array2String, Close GH-323
Former-commit-id: 25de9183137cb4b89253f0ef197b7dcb41793420
2020-01-31 20:40:24 +07:00
Ghost_chu 5708801b3c 3.1.3.7
Former-commit-id: 7454ba6b55892e36a8af0c3e46b0e4899eb62e38
2020-01-30 15:14:07 +08:00
Ghost_chu 19f1eb751f 3.1.3.6
Former-commit-id: 1a3cb035140297f6d03789f49f2b7b8a35d3dd97
2020-01-30 15:13:40 +08:00