Commit Graph
5007 Commits
Author SHA1 Message Date
sandtechnology 14d04347d2 #653 Support hot loading
Former-commit-id: b745c73ac06ddac8bdfbedb7c2ebdcfd5511e7ee
2020-11-22 11:01:20 +08:00
sandtechnology 8bacfc8e8a Fire ShopSignUpdateEvent in the right position
Former-commit-id: 5c552f4ff8e8ae8f96a1b15cc8b7270176b4d7b2
2020-11-22 10:32:19 +08:00
sandtechnology bc31949cc9 final the prices
Former-commit-id: 393c89fdc163eb0f75742e1052935489d4d7a802
2020-11-22 10:30:46 +08:00
sandtechnology 68800c5202 Add new ShopItemChangeEvent
Former-commit-id: 5bfaab09224d452cd7a8f95a0290f9b9720c28cf
2020-11-22 10:29:02 +08:00
sandtechnology 5bda2e6ab6 Fix wrong javadoc in event and add missing event calling, fix #655
Former-commit-id: f03181525ca1a72a89d156ff79f366a71bd6750b
2020-11-22 10:22:04 +08:00
sandtechnology e95429b6cc Correct type parameter
Former-commit-id: fb912c0ebe0de2cb42169bc9bf678009106808ae
2020-11-22 01:13:45 +08:00
sandtechnology 799515c69a Change structure for friendly API
Former-commit-id: 590a160b2b0c68b5efad93be94aac77834907c2f
2020-11-22 01:11:05 +08:00
sandtechnology ff3085f469 Refactor Compatibility, prepare for hot loading feature
Former-commit-id: b06a3efc0adf5f23b86081b57784fc7b1ca03939
2020-11-22 00:59:01 +08:00
sandtechnology 27b63b4380 Merge remote-tracking branch 'origin/master'
Former-commit-id: 39f51a361edf0e0e2b9d3ccf088548ba23c25617
2020-11-22 00:25:06 +08:00
sandtechnology 9c1922c27d Refactor Integration, prepare for hot loading feature
Former-commit-id: 2ee199100447b6299a1a95fea53298ac0a503e06
2020-11-22 00:24:49 +08:00
sandtechnology d58d4c1c9f Caching api instance
Former-commit-id: 1553a3a41f07a688f8979e5fb4323d769ee9c317
2020-11-22 00:19:53 +08:00
sandtechnology 04bb374cde Merge pull request #652 from Ghost-chu/release
Merge pull request #651 from Ghost-chu/master

Former-commit-id: 9c8df9ce57ec0878db53f917b8934e017dbbd4e6
2020-11-21 09:03:00 +08:00
sandtechnology 02d82b7adb Merge pull request #651 from Ghost-chu/master
4.0.5.3

Former-commit-id: b3e141df74b7b9ae4a941e1bfa7dcd91680950ce
2020-11-20 18:17:14 +08:00
sandtechnology de2beb5fb9 add warning for releasing connection
Former-commit-id: 5cd3c0ab3e2fff7e1eda6c23dcf87db028b355e4
2020-11-20 17:31:05 +08:00
sandtechnology 578de12824 4.0.5.3
Former-commit-id: 587e988f9afd0553736ac5c33877f3ac937f5285
2020-11-20 17:21:46 +08:00
sandtechnology e9a629c40a Fix another deadlock.......
Former-commit-id: 80a454406defb596a3b3d9f426facade4cbbd6dc
2020-11-20 13:46:56 +08:00
sandtechnology 68d23987d2 Fix another deadlock
Former-commit-id: cde7347c4547fe7c1f902f937bdc0653b6383758
2020-11-20 13:20:03 +08:00
sandtechnology 98b37c6e0f Fix another deadlock
Former-commit-id: cd106a88314dbb46d7c4a7e9d597cd8c67fb59e7
2020-11-20 13:18:00 +08:00
sandtechnology 08169fd3ed Add missing logic
Former-commit-id: be1168cc519f06bf856d795a8333bd345c430b4e
2020-11-20 12:46:19 +08:00
sandtechnology 93b0e1bad6 Try to fix #650 again, redesign connection occupied logic.
Former-commit-id: 8f67c7bc672ed0bde0f67f9d2e5ce614ddaa913a
2020-11-20 12:41:37 +08:00
sandtechnology fbac1221e2 Merge remote-tracking branch 'origin/master'
Former-commit-id: e6fae8bad02d919b693654481aff3a9da85dead7
2020-11-20 12:25:38 +08:00
sandtechnology 16d1cebb06 Try to fix #650, synchronized for database connection
Former-commit-id: 07fad3a227b9e5f4e704671b3c7559921b9e01e5
2020-11-20 12:25:02 +08:00
sandtechnology 7ebc5ce521 Merge pull request #649 from Ghost-chu/release
Merge pull request #648 from Ghost-chu/master

Former-commit-id: ed64209273b028d4f3a9d30975e7006e72049626
2020-11-19 19:25:41 +08:00
sandtechnology b0d8b595ce Merge pull request #648 from Ghost-chu/master
4.0.5.2

Former-commit-id: 0c660ca1f6516f9a19c6a182a5ce4fa2de56d832
2020-11-19 19:25:22 +08:00
sandtechnology 10f1ab2212 4.0.5.2
Former-commit-id: dac2923266958f3f1cc8bac65575ea1939dec8f7
2020-11-19 19:19:02 +08:00
sandtechnology 549177f440 Add unit test for InteractUtil
Former-commit-id: fac61000e38bc0f55fa9524f40d4e849e22d161e
2020-11-19 19:16:52 +08:00
sandtechnology c05c28a7c7 Fix NoClassDefFoundError when init sentryErrorReporter
Former-commit-id: 0a2667999b1a44f131617b761adec71e72a90d9e
2020-11-19 18:46:19 +08:00
sandtechnology 6a043469a1 Fix interacting bug (thanks to @mantraop on discord)
Former-commit-id: 51251f50642296e483381883986f5e9e59b6a9d1
2020-11-19 18:40:56 +08:00
sandtechnology b3ed6008ef Merge remote-tracking branch 'origin/master'
Former-commit-id: aac92120b5cebedc315d6428dfb9b668d715e50f
2020-11-19 17:48:52 +08:00
sandtechnology 7402770248 Temporary fix NoClassDefFoundError when init sentryErrorReporter
Former-commit-id: ed4ef5895382bba8c1950a3e25ce7f35547143d3
2020-11-19 17:48:33 +08:00
sandtechnology b32ee0adf1 Merge pull request #646 from Ghost-chu/release
Merge Release Tag

Former-commit-id: 1141bdd1d313efce8893ba1ae60088813f4694b2
2020-11-17 12:08:54 +08:00
sandtechnology 9ee09e4897 Merge pull request #645 from Ghost-chu/master
4.0.5.1

Former-commit-id: 95e19a627c114f2369b1017d838fd6b5a2ff3f6f
2020-11-17 11:53:18 +08:00
sandtechnology e15a6c5e7c Private modifier
Former-commit-id: 07ac0a2f3870647ddf1c9930fbd025ca912cbbb2
2020-11-17 11:50:28 +08:00
sandtechnology c98e7f31f8 4.0.5.1
Former-commit-id: c59dbe13a865962c94bf21488aa08930e8c02c6f
2020-11-17 11:46:26 +08:00
sandtechnology 8e6839d6cf Merge pull request #643 from Ghost-chu/l10n_master
New Crowdin updates

Former-commit-id: fea20d89abe2435c5de8850aecfa7fe70ac2292c
2020-11-17 11:44:39 +08:00
sandtechnology 7b1294b0bd Merge pull request #644 from Ghost-chu/dependabot/maven/com.github.angeschossen-LandsAPI-4.11.8
Bump LandsAPI from 4.11.5 to 4.11.8

Former-commit-id: 81ce6d8dc96ec1c1d33ca2a79fc3f0411138c35b
2020-11-17 11:44:23 +08:00
sandtechnology 7431424403 Fix bug in find command, thanks to @kenanbit
Former-commit-id: c8c75f5a68e7121bfc8a30988ab5c41496f9aa7c
2020-11-17 11:41:56 +08:00
sandtechnology f0466bf443 Fix sign recognize issue and build error
Former-commit-id: c79f4adacf4681964ef53d1a235a1312f630f007
2020-11-17 11:23:42 +08:00
dependabot-preview[bot] 51e7477a74 Bump LandsAPI from 4.11.5 to 4.11.8
Bumps [LandsAPI](https://github.com/Angeschossen/LandsAPI) from 4.11.5 to 4.11.8.
- [Release notes](https://github.com/Angeschossen/LandsAPI/releases)
- [Commits](https://github.com/Angeschossen/LandsAPI/compare/4.11.5...4.11.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Former-commit-id: 355e9c56482cdf6edf1f263e957b2cb04a16dcdb
2020-11-16 07:11:53 +00:00
sandtechnology 1a0f2773c4 Putting convert progress to an async task to prevent watchdog issue.
Former-commit-id: e8d6779be294f98a2831002ce21b2ccef975c21c
2020-11-14 23:11:01 +08:00
Ghost_chu 4c0a504bd7 New translations messages.json (Chinese Traditional)
Former-commit-id: a59a3117436d708ece95a696ec3f11f87d9150c2
2020-11-14 17:15:23 +08:00
sandtechnology 241b4eab74 Implement #642
Former-commit-id: d3f5e000f3eece3ca03e0bc59f1e71e8e15995d2
2020-11-14 09:57:21 +08:00
sandtechnology c12e6e34c0 Merge pull request #640 from Ghost-chu/master
4.0.5.0

Former-commit-id: 334f8fd0852976bf8726297f429faa982038e0d1
2020-11-13 22:13:09 +08:00
sandtechnology f3ebced4cd Apply IDE suggestions
Former-commit-id: eaecea5ac17917f4e10d22a8bba1640338e67ac4
2020-11-13 15:00:25 +08:00
sandtechnology 020ef861d1 Using try-with-resources
Former-commit-id: 00f991b6a6eb470fec57bcf3304f5cf468be88db
2020-11-13 14:48:22 +08:00
sandtechnology d0add54eae Always waiting connection
Former-commit-id: fd38faf6e3b52a6363f1a83f079c02025739d1e7
2020-11-13 14:37:31 +08:00
sandtechnology 11351d17d8 Logging in debug log
Former-commit-id: a0d69d1a81f9b0986b51f3457894be2b14693dfb
2020-11-13 14:29:13 +08:00
sandtechnology 8c552db573 Fix interrupt
Former-commit-id: 8b4422eb421b935fa09c8ed358425c926b8f0f83
2020-11-13 14:27:01 +08:00
sandtechnology 78a0587c49 Use java.util.ArrayList instead of java.util.LinkedList
Former-commit-id: 9d16ee1389704adab81b6eda4e14c98e4402b18b
2020-11-13 14:21:59 +08:00
sandtechnology d4a0ff4298 Logging InterruptedException
Former-commit-id: eb826f9147a2b023524e875c4a8c48891e96bd46
2020-11-13 14:18:17 +08:00