Commit Graph
2877 Commits
Author SHA1 Message Date
Ghost_chu a48e09a8f5 Internal calls Impl
Former-commit-id: ed9e8805cf882a635763131816cd3a0c27b1807a
2020-04-06 13:48:55 +08:00
Ghost_chu 8ff43260c7 Merge remote-tracking branch 'origin/master'
Former-commit-id: 6670b483c4aa5e9dbdda40fd14b920d24db95ceb
2020-04-06 13:45:23 +08:00
Ghost_chu 890b3741aa Design interface for Compatibility and impl it
Former-commit-id: 9e4acc39b50a68843fdbdbec3db3b3cd20cde355
2020-04-06 13:45:10 +08:00
sandtechnology 9b28423b06 Moving ItemMatcher
Former-commit-id: d275c67568720a1614b22128267e9e3a748fcf03
2020-04-06 13:40:16 +08:00
Ghost_chu 4f5f15b1a3 Design Interface for GameLanguage and impl it
Former-commit-id: 03294ebacf85ab7f2f4568c518ddc20962ca56d8
2020-04-06 13:14:09 +08:00
Ghost_chu b7b3b5ec2b Remove log4j
Former-commit-id: 3ef2664779acc4552f636d5662b6fea7a5e66c0b
2020-04-06 12:49:22 +08:00
Ghost_chu 94f961e9f6 Designed for Interface and some impl
Former-commit-id: 920188099a396818cd3fe90d03694a11b66a8797
2020-04-06 12:44:53 +08:00
sandtechnology c35cf46126 3.1.4.31
Former-commit-id: fb840cf2509079b4fc2a2a6a90f39109a0d94eb4
2020-04-06 11:58:27 +08:00
sandtechnology 3864cbc664 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/org/maxgamer/quickshop/Command/SubCommands/SubCommand_Staff.java


Former-commit-id: 36f97b606c8a6204a44626e81ae5de007e00b8e4
2020-04-06 11:55:26 +08:00
sandtechnology 1d51f8b55f Fix staff command
Former-commit-id: cc15f417bbd14c5b75893e509fc16652fb417b46
2020-04-06 11:54:47 +08:00
Ghost_chu d28edf60c4 Fix staff issue
Former-commit-id: a07b2f0bb0e367be5786e4eb18f8b4c601982315
2020-04-06 11:31:10 +08:00
Ghost_chu e219f80a17 Merge remote-tracking branch 'origin/master'
Former-commit-id: b598eebc2f3f214f09e046c41527e77ab8294d5e
2020-04-06 11:30:37 +08:00
sandtechnology cfe77fb5a3 Merge remote-tracking branch 'origin/master'
Former-commit-id: 4d9ea259fcc2e946c9fd2a7964fdc02cb751e8c4
2020-04-06 10:54:31 +08:00
sandtechnology 6edadd23bd 3.1.4.30
Former-commit-id: 6864b8960709cf0c596556438caaedb6b0662170
2020-04-06 10:53:46 +08:00
Ghost_chu 6e0dbe9a3c Remove useless code from plugin
Former-commit-id: b7420c5a36f7e483546acfea98d98f18698f1010
2020-04-06 09:38:58 +08:00
Ghost_chu 0daab6efee Merge pull request #400 from Ghost-chu/l10n_master
New Crowdin translations

Former-commit-id: 9b2c9beed04f4df1be4fa0a64ca8ff20e082362b
2020-04-06 09:03:34 +08:00
Ghost_chu 736a469949 New translations messages.json (Polish)
Former-commit-id: ef3298b8e851655263f10198bbfcca03bf0a8d17
2020-04-06 05:53:32 +08:00
sandtechnology b8c24639fc Rearrange code
Former-commit-id: ce08dff9c0b1019c012075c2a3e9ecddf17789ce
2020-04-06 02:21:47 +08:00
sandtechnology 4cdc16b0c4 Ignore a wrong NPE warning
Former-commit-id: 8379d2af46d6a5e4924f062b8780b828c33ea068
2020-04-06 02:17:46 +08:00
sandtechnology e303037504 Add missing shulkerBox check
Former-commit-id: cec74b6236b24efee875b99eecf8f2e2166d7743
2020-04-06 01:57:30 +08:00
sandtechnology 68d1e07da6 Also delete wrong config node
Former-commit-id: f632813535db01d96fcb84e131e3871c3d55745e
2020-04-06 00:40:48 +08:00
sandtechnology d21117aa87 Fix several bugs
Former-commit-id: e451c079d6aceb2c0882406f9a71d33e72ebd28d
2020-04-06 00:37:47 +08:00
sandtechnology 66cdf4e638 Merge remote-tracking branch 'origin/master'
Former-commit-id: 73f9cdb370d63ab238c68b9c9de929f14109d7e8
2020-04-06 00:12:42 +08:00
sandtechnology 2d4e6399b2 fix config node typo
Former-commit-id: 90ad4b2636401d16d4a40c0051910a1d99871418
2020-04-06 00:12:00 +08:00
Ghost_chu 9deb649dcc New translations messages.json (French)
Former-commit-id: 2ee916cab00c4051672b244b453ff4bf744cb277
2020-04-05 21:47:28 +08:00
Ghost_chu 8ddc1e0ae1 New translations messages.json (French)
Former-commit-id: 05019ed24893f666ec28fae36781b13b8a5bbe47
2020-04-05 21:19:06 +08:00
Ghost_chu 227cb81e5a New translations messages.json (French)
Former-commit-id: 76443f598c38b18f18090d391c98ef33729e9e08
2020-04-05 21:13:28 +08:00
Ghost_chu ea76f39b6e New translations messages.json (French)
Former-commit-id: 79cacae20454c7716f574a684ee3372900d002a9
2020-04-05 21:07:39 +08:00
Ghost_chu 8c0f4d62ad New translations messages.json (Finnish)
Former-commit-id: fed9c1011f354492a61dba596942d91317765634
2020-04-05 18:20:56 +08:00
Ghost_chu c2102216c0 Merge pull request #399 from Ghost-chu/l10n_master
New Crowdin translations

Former-commit-id: 564240921c68a560cf57c7f283f1c8a1e7b8e875
2020-04-05 18:04:11 +08:00
Ghost_chu 3702c3602c New translations messages.json (Turkish)
Former-commit-id: df97c394529d914e580f6ec5e75b0a0173c33806
2020-04-05 16:37:18 +08:00
Ghost_chu 274f74c1a8 New translations messages.json (Chinese Simplified)
Former-commit-id: 5dcf1ffc29d37250948aeccad517dea3894b0d3d
2020-04-05 16:37:16 +08:00
sandtechnology a4b1c1cdce fix typo
Former-commit-id: 5f009b26eb99009c8145b04ad49512644cbcb4df
2020-04-05 15:01:23 +08:00
Ghost_chu 611e970ba1 Merge pull request #397 from Ghost-chu/l10n_master
New Crowdin translations

Former-commit-id: 5b27ca70b2a59a7bc813d9483d7e5a9a1a214c09
2020-04-05 14:45:42 +08:00
sandtechnology fe381becd1 Fix bypassing in shulkerbox content check
Former-commit-id: 3005c589c6200410a3efdd3792d574215a7b9f67
2020-04-05 14:35:23 +08:00
sandtechnology 0e3d46044b Tweak default value for may cause sign dupe
Former-commit-id: 596db1ab043b6faf7d993d76ebf5f9bcc799fd8f
2020-04-05 14:16:59 +08:00
sandtechnology 455ee46edd Implement shulkerBox content match, close #394
Former-commit-id: 65036dd66f40d56c0f848f4a4db7a911950a1e13
2020-04-05 13:45:23 +08:00
Ghost_chu 6f449f0fb9 New translations messages.json (Portuguese, Brazilian)
Former-commit-id: 7bfa0070a3b9e3a0de153795e2494ee8b32df979
2020-04-05 13:38:41 +08:00
Ghost_chu 49a68905d6 New translations messages.json (German)
Former-commit-id: 81c36df851ec5d2c16d48e58f706fb8d643732db
2020-04-05 13:38:40 +08:00
Ghost_chu cfba116c14 New translations messages.json (Finnish)
Former-commit-id: 8eec7e778c5d37c46cace37780fd0f2219118331
2020-04-05 13:38:38 +08:00
Ghost_chu 61f9c28391 New translations messages.json (Italian)
Former-commit-id: 34473112d2ea263aaa19251136280e7b1a86c2c3
2020-04-05 13:38:37 +08:00
Ghost_chu 662314ac0b New translations messages.json (Japanese)
Former-commit-id: 2e2d7c79f0a62b3e97b72519a5f8607628ef6e58
2020-04-05 13:38:35 +08:00
Ghost_chu 110a65366c New translations messages.json (Korean)
Former-commit-id: f41da52d02f481e2087a60b0a777473121d1d8c5
2020-04-05 13:38:34 +08:00
Ghost_chu 4bb976668a New translations messages.json (Dutch)
Former-commit-id: 5889e5fac27fa073471f8bed23116d35933cc8b4
2020-04-05 13:38:32 +08:00
Ghost_chu fd609922f7 New translations messages.json (Polish)
Former-commit-id: 64c880bd92a5caa6ecc5735c6f8bfaaefb943634
2020-04-05 13:38:30 +08:00
Ghost_chu 9cdcd3f8da New translations messages.json (Russian)
Former-commit-id: 4277a6eada71f3e33fe368da4beebed2a1abbd0e
2020-04-05 13:38:29 +08:00
Ghost_chu 5b493c5a86 New translations messages.json (Turkish)
Former-commit-id: 56bd5a9f553c48dd7fcec33976c9e8cd01a971a1
2020-04-05 13:38:27 +08:00
Ghost_chu 0bccd094fb New translations messages.json (Chinese Simplified)
Former-commit-id: b29095234626d4ac1c5b1faf85d229c535420a5f
2020-04-05 13:38:26 +08:00
Ghost_chu ef7adbc7af New translations messages.json (Chinese Traditional)
Former-commit-id: 77d4bbc7c27309819f3c39df634e112377e9b35a
2020-04-05 13:38:24 +08:00
Ghost_chu 9e9aaeb808 New translations messages.json (Romanian)
Former-commit-id: 86a9b05bc0c20569a8155eec9a1343b54ea12061
2020-04-05 13:38:22 +08:00