merge-mamba[bot]
commented
3 years ago Potential Conflict Warning
This pull request has changes that overlap with branches below. You might want to check in with the other branch authors before you merge to avoid a conflict. 🐍
master-plotSquared6 (@sandtechnology)
- pom.xml (modified)
v5(@Ghost-chu) - src/main/java/org/maxgamer/quickshop/util/MsgUtil.java (modified)
- pom.xml (modified)
- src/main/java/org/maxgamer/quickshop/QuickShop.java (modified)
- src/main/java/org/maxgamer/quickshop/util/Util.java (modified)
- src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java (modified)
Something wrong? Got a suggestion? Email me or leave feedback here.
the-label-bot[bot]
Added sign feature, solved #1155
Fix WorldGuard Integration not work missing after reloading
New translations messages.json (Chinese Simplified)
New translations messages.json (Finnish)
Improved README with some HTML
Improved README with some HTML
Create 1
Saved README icons locally to improve loading
Delete 1
Some more improvements
Fix the compatibility of VirtualDisplayItem on 1.17.1 Fix #1264
Fix the compatibility of VirtualDisplayItem on 1.17.1 Fix #1264
Fix NullPointerException when creating shop
Add sign placement checking and improve sign change checking
Bump version
Bump ProtocolLib from 4.7.0-SNAPSHOT to 4.7.0
Bumps ProtocolLib from 4.7.0-SNAPSHOT to 4.7.0.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Improve Ongoing Fee logic
Add missed allowLoan condition
Fix version comparing bug
Replace check to common sign
Format as tables
Delete unused spaceholder for icons
4.0.9.5 (#1271) (#1274)
Update from release bunch (#1158)
Co-authored-by: Ghost_chu 30802565+Ghost-chu@users.noreply.github.com
New translations messages.json (Romanian)
New translations messages.json (Dutch)
New translations messages.json (Portuguese, Brazilian)
New translations messages.json (Vietnamese)
New translations messages.json (English)
New translations messages.json (Chinese Traditional)
New translations messages.json (Chinese Simplified)
New translations messages.json (Ukrainian)
New translations messages.json (Turkish)
New translations messages.json (Swedish)
New translations messages.json (Serbian (Cyrillic))
New translations messages.json (Russian)
New translations messages.json (Portuguese)
New translations messages.json (Polish)
New translations messages.json (Norwegian)
New translations messages.json (Korean)
New translations messages.json (French)
New translations messages.json (Japanese)
New translations messages.json (Italian)
New translations messages.json (Hungarian)
New translations messages.json (Hebrew)
New translations messages.json (Finnish)
New translations messages.json (Greek)
New translations messages.json (German)
New translations messages.json (Danish)
New translations messages.json (Czech)
New translations messages.json (Catalan)
New translations messages.json (Arabic)
New translations messages.json (Afrikaans)
New translations messages.json (Spanish)
New translations messages.json (Chinese Traditional, Hong Kong)
New translations messages.json (Swedish)
New translations messages.json (Czech)
New translations messages.json (Norwegian)
New translations messages.json (Chinese Simplified)
New translations messages.json (Chinese Traditional)
Fix reloading after updated by /qs update
Stop reloading after updated by /qs update
Catching exception in reload command
New translations messages.json (Korean)
New translations messages.json (Korean)
New translations messages.json (Czech)
New translations messages.json (Turkish)
Fix loading timer issue
Add GroupManager check
Fix timer issue
New translations messages.json (Turkish)
New translations messages.json (Turkish)
New translations messages.json (Turkish)
New translations messages.json (Finnish)
New translations messages.json (Finnish)
debug vdisplay
debug vdisplay
Keep debugging
Only try convert packet
Only try convert packet
Prevent user reload quickshop after use command /qs update
Also cancel tasks when we setup boot error
Fix onCommand sound issue
Fix ArrayIndexOutOfBoundsException when having boot error
Fix ArrayIndexOutOfBoundsException in CommandManager
Fix bug in
fix bugFix incorrect string calling
New translations messages.json (German)
Update maven.yml
bump version
fix maven conflict
New translations messages.json (Chinese Simplified)
Bump helper from 5.6.5 to 5.6.8
Bumps helper from 5.6.5 to 5.6.8.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Re-add outdated api methods to improve backward compatibility. Schedule removal in v5
Add support for PlotSquared 6 (WIP) (#1208)
Add support for PlotSquared 6 (WIP)
Resolved package name conflicting by multiple projects
Fix build
Fix bug when using getShopWithCaching
New translations messages.json (Russian)
New translations messages.json (Russian)
Wrong JDK name fixed (#1226)
Shouldn't this be JDK 16? (Because it says java-version: '16'...)
Extract shop loading out of loop, fixed #1151
Allow all transparent block
New translations messages.json (Chinese Simplified)
move to async thread
Todo
Refactor to use EconomyTransaction
New translations messages.json (Japanese)
New translations messages.json (Spanish)
Fix shop sign is editable
Added sign feature, solved #1155
Fix WorldGuard Integration not work missing after reloading
New translations messages.json (Chinese Simplified)
New translations messages.json (Finnish)
Fix the compatibility of VirtualDisplayItem on 1.17.1 Fix #1264
Fix the compatibility of VirtualDisplayItem on 1.17.1 Fix #1264
Fix NullPointerException when creating shop
Add sign placement checking and improve sign change checking
Bump version
Bump ProtocolLib from 4.7.0-SNAPSHOT to 4.7.0
Bumps ProtocolLib from 4.7.0-SNAPSHOT to 4.7.0.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Improve Ongoing Fee logic
Add missed allowLoan condition
Fix version comparing bug
Replace check to common sign
Co-authored-by: Ghost_chu 30802565+Ghost-chu@users.noreply.github.com Co-authored-by: github-actions[bot] 41898282+github-actions[bot]@users.noreply.github.com Co-authored-by: Ghost_chu 2908803755@qq.com Co-authored-by: dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Co-authored-by: Chris 65610536+Chris6ix@users.noreply.github.com
Co-authored-by: Ghost_chu 30802565+Ghost-chu@users.noreply.github.com Co-authored-by: github-actions[bot] 41898282+github-actions[bot]@users.noreply.github.com Co-authored-by: Ghost_chu 2908803755@qq.com Co-authored-by: dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Co-authored-by: Chris 65610536+Chris6ix@users.noreply.github.com
Fix #1275
4.0.9.6
Fix NPE in 1.16-
Optimize the sign feature
4.0.9.7
New translations messages.json (Spanish)
fix: upgrade org.slf4j:slf4j-nop from 1.7.30 to 1.7.31
Snyk has created this PR to upgrade org.slf4j:slf4j-nop from 1.7.30 to 1.7.31.
See this package in Maven Repository: https://mvnrepository.com/artifact/org.slf4j/slf4j-nop/
See this project in Snyk: https://app.snyk.io/org/ghost-chu/project/7c33ca23-034e-4a8d-a855-67eab090487d?utm_source=github&utm_medium=upgrade-pr
Added downloads counter and rating (Spigot)
Remove useless synchronized operation
Bump placeholderapi from 2.10.9 to 2.10.10
Bumps placeholderapi from 2.10.9 to 2.10.10.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Add todo
Allow user format the help list
New translations messages.json (Japanese)
New translations messages.json (Korean)
New translations messages.json (Portuguese, Brazilian)
New translations messages.json (Vietnamese)
New translations messages.json (English)
New translations messages.json (Chinese Traditional)
New translations messages.json (Ukrainian)
New translations messages.json (Turkish)
New translations messages.json (Swedish)
New translations messages.json (Serbian (Cyrillic))
New translations messages.json (Russian)
New translations messages.json (Portuguese)
New translations messages.json (Polish)
New translations messages.json (Norwegian)
New translations messages.json (Dutch)
New translations messages.json (Italian)
New translations messages.json (Chinese Simplified)
New translations messages.json (Hungarian)
New translations messages.json (Hebrew)
New translations messages.json (Greek)
New translations messages.json (German)
New translations messages.json (Danish)
New translations messages.json (Czech)
New translations messages.json (Catalan)
New translations messages.json (Arabic)
New translations messages.json (Afrikaans)
New translations messages.json (French)
New translations messages.json (Romanian)
New translations messages.json (Finnish)
New translations messages.json (Spanish)
New translations messages.json (Chinese Traditional, Hong Kong)
[ImgBot] Optimize images
*Total -- 68.30kb -> 56.07kb (17.9%)
/.github/icons/MCBBS.png -- 29.44kb -> 23.04kb (21.74%) /.github/icons/Jenkins.svg -- 29.10kb -> 23.76kb (18.37%) /.github/icons/Github.png -- 1.32kb -> 1.22kb (7.91%) /.github/icons/Bukkit.png -- 6.50kb -> 6.12kb (5.74%) /.github/icons/Discord.svg -- 1.94kb -> 1.94kb (0.2%)
Signed-off-by: ImgBotApp ImgBotHelp@gmail.com
New translations messages.json (English)
Impl GriefPrevention integration#delete-on-unclaim and delete-on-claim-expired
Add new contributor
Bump commons-compress from 1.20 to 1.21
Bumps commons-compress from 1.20 to 1.21.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Bumps spigot-api from 1.17-R0.1-SNAPSHOT to 1.17.1-R0.1-SNAPSHOT.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Fixed shop delete bypassing in previous commit
Eliminated duplicated Code. Changed variables names. Fixed problem with the Grief Prevention untrust handler (it would remove shops that were not related to the claim that someone untrusted other person). Reverted changes made by Ghost_chu that wouldn't make sense in the context of GriefPrevention (now when a claim is unclaimed or expired all shops inside it will me deleted as well).
Delete semgrep.yml
New translations messages.json (Danish)
Changed code in the event handler of unclaimed/expired claim to consider subclaims. Fixed more problems in the event handler of untrusted claim to consider subclaims. Also removed the code event.isGiven() because if the player changes the trust permission from one greater level to another lower level, it does not consider as untrust, so it happens problems. Refactored the previous event because of the problems of the return statements inside loops.
Implemented event listener to delete shops if they are outside a Grief Prevention claim when the claim is resized/shrinked.
Bump LandsAPI from 5.10.2 to 5.12.1
Bumps LandsAPI from 5.10.2 to 5.12.1.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Re-add another missing deprecated API, some addon still use it
Re-add another missing deprecated API, some addon still use it
Add built-in AdvancedRegionMarket integration
Fix the language guessing when it is English
Fix an rare case when running task before setting variable Fix #1310
Fix wording
Fix Integration with AdvancedShopRegionMarket
Default false
spelling
Bump LandsAPI from 5.12.1 to 5.12.2
Bumps LandsAPI from 5.12.1 to 5.12.2.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
New translations messages.json (Chinese Traditional, Hong Kong)
Merge two if statements which is the same, fix #1324
Closed #1318
Add dynamic economy setup listener, change economy failure from HARD FAIL to SOFT FAIL
Fix #1318 properly
Fix ghost shop bug
Big improvements to the Grief Prevention Integration. Fixed some bugs. Refactored some things.
Deleted some features/validation because of some problems found.
Full async
Fix build error
Prevent memory leak
Fix build error
Fix more build errors
Don't cancel handler
Minor fix in the trust changed event.
update configuration
Make QSEvent can set async or sync
New translations messages.json (Dutch)
Only show optional args while player hands is empty to prevent confusing the players
Removed synchronized mark
Remove useless clone calls
Close #1339, Cleanup timerTaskList while plugin disabling
Fixed #1321, fixed QuickShop won't update the cache files when server upgraded
For newer Minecraft versions, use isAir to instead
Use timerTaskList in onEnable
mistake
Edit the document part: Contribute
New translations messages.json (Dutch)
Fix README
Fix readme
Improved the Grief Prevention Integration by changing the config file.
Fixed #1351, Try search the quickshop jar if old jar not found
Add more details while loading shops
Force shop database updating in async thread
Prevent multi updates while shop loading
Cleanup
Thread-safe update0() method
update0 actually can safety executing on any threads
try to resolve npe issue
Fix npe while disabling
Improve shop loading and logging
Fix duplicated updating correctly, fix error on plugin disable
Use the right set implementation
Fix wording
Fixed/Changed some things, in order for the pull request to be approved.
Fix VirtualDisplayItem disappear bug
Fix another display disappear bug
Bump LandsAPI from 5.12.2 to 5.12.7
Bumps LandsAPI from 5.12.2 to 5.12.7.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Do not load chunk in shop init process and deduplicate loading, fix #1360
Tweak calling event to before loading, save resources
Big changes/improvements/bug fixes to the Grief Prevention Integration (#1352)
Big improvements to the Grief Prevention Integration. Fixed some bugs. Refactored some things.
Deleted some features/validation because of some problems found.
Minor fix in the trust changed event.
Improved the Grief Prevention Integration by changing the config file.
Fixed/Changed some things, in order for the pull request to be approved.
Co-authored-by: 1171066 1171066@isep.ipp.pt
Added whitelist-mode option to Towny Integration in the config file
New translations messages.json (Spanish)
New translations messages.json (Spanish)
Use sync packet adapter, but it still fast enough
Modify the config.yml
Fix the merge issues
Fix Minedown format issue
Revert "Fix the merge issues"
This reverts commit f732ed64cce2110e9c0f89df2b4287866d9f9452.
This reverts commit 3f09f2d5ccabfc157b8a21b8405c8fff7eb53d22.
New translations messages.json (Portuguese, Brazilian)
New translations messages.json (Portuguese, Brazilian)
Use shared packetAdapter to prevent busy collection inside of ProtocolLib to hurt the server TPS
Don't load chunks in init
Tweaking determine order for save cpu time
New translations messages.json (Chinese Traditional)
Bump VaultAPI from 1.7 to 1.7.1
Bumps VaultAPI from 1.7 to 1.7.1.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Let MineDown translate all color code when loading message Fix sign color issue, revert ef07390a
Minor fix to a bug related to the TrustChangedEvent of GriefPrevention Integration (#1381)
Co-authored-by: 1171066 1171066@isep.ipp.pt
Fix broken messages, support minedown format
Fix broken help command
Minor Fix in GriefPrevention Integration (#1382)
Minor fix to a bug related to the TrustChangedEvent of GriefPrevention Integration
Deleted a part of code that was supposed to be deleted
Co-authored-by: 1171066 1171066@isep.ipp.pt
Fix broken VirtualDisplayItem
Fix build
Fix NPE
Do not load the chunks while getting stats
Add all-in-one permission node
quickshop.player - all players permissions need to grant quickshop.moderator - all moderator permissions need to grant for admins, you just need give them quickshop.* and all should be works
Only clean and count loaded shops
New translations messages.json (Swedish)
1406 ItemConfig column: utf8mb4 encoding for mysql
Using ThreadLocal for preventing concurrent issue
Fix an NPE issue, unload when actually loaded
Lazy initialize decimalFormat value, fix format issue
Bump LandsAPI from 5.12.7 to 5.13.0 (#1393)
Bumps LandsAPI from 5.12.7 to 5.13.0.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com
Bumps PlotSquared-Core from 6.0.0-SNAPSHOT to 6.0.8-SNAPSHOT.
updated-dependencies:
Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com
Bump version
Optimize timerTaskList iterating
Remove redundant getter for timerTaskList
Revert "Fixed #1351, Try search the quickshop jar if old jar not found"
This reverts commit 000b26922643de149f5d3f2166571e62cc85d120.
Remove redundant info message and variable in Info command
Fix resource leaking and bug in MojangGameLanguageImpl
Optimize VirtualDisplayItemManager
Optimize AdvancedShopRegionMarketIntegration
Use thread-safe list
[VirtualDisplayItem] Huge improve performance
Remove duplicated loading for i18nFile
Co-authored-by: Ghost_chu 2908803755@qq.com Co-authored-by: Chris 65610536+Chris6ix@users.noreply.github.com Co-authored-by: Ghost_chu 30802565+Ghost-chu@users.noreply.github.com Co-authored-by: github-actions[bot] 41898282+github-actions[bot]@users.noreply.github.com Co-authored-by: dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Co-authored-by: snyk-bot snyk-bot@snyk.io Co-authored-by: ImgBotApp ImgBotHelp@gmail.com Co-authored-by: 1171066 1171066@isep.ipp.pt Co-authored-by: raphtaliapt 64327988+raphtaliapt@users.noreply.github.com