Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.1.2.5 1.20.2 Support #406

Merged
merged 760 commits into from
Oct 3, 2023
Merged

5.1.2.5 1.20.2 Support #406

merged 760 commits into from
Oct 3, 2023

Conversation

sandtechnology
Copy link

No description provided.

sandtechnology and others added 30 commits June 22, 2022 14:54
@sandtechnology
Clearify the protection-checking message
7a389ec
@sandtechnology
Always run sync for displayDupeRemoverWatcher
677db12
@sandtechnology
Deprecated DisplayDupeRemoverWatcher
6b88799 
It now will be checked when checking display
@sandtechnology
Only transfer selling shop to other player
037a2bd
@sandtechnology
Fix transfer description
6df58f5
@sandtechnology
Remove default transfer permission
235acdd 
It's dangerous for player and should recreate a shop or contact admin
@github-actions @crowdin-bot
New Crowdin translations by Github Action (#196)
5d7b9aa 
Co-authored-by: Crowdin Bot <[email protected]>
@Smudgge
Fix shulkers in shulker shop (#204)
1d62887
@sandtechnology
Add convertlog command for getting readable log and fix permission
2f50d43
@sandtechnology
Fix map comparing in QS matcher
ceb39b9
@sandtechnology
LogConvert command optimization
7287a46
@sandtechnology
#206 Fix useEnhanceProtection handling entity protection
3dbc2b0
@sandtechnology
Bump version
edad621
@sandtechnology
Workaround for #212
8a332a6
@dependabot
Bump item-nbt-api-plugin from 2.9.2 to 2.10.0 (#192)
f077f91 
Bumps item-nbt-api-plugin from 2.9.2 to 2.10.0.

---
updated-dependencies:
- dependency-name: de.tr7zw:item-nbt-api-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sandtechnology
Add regex support for blacklist-world option
46acd77
@sandtechnology
Disable sk89q repo for 503
fa48d50
@dependabot
Bump openinvapi from 4.2.0 to 4.2.1 (#215)
fb00345 
Bumps [openinvapi](https://github.com/Jikoo/OpenInv) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/Jikoo/OpenInv/releases)
- [Commits](Jikoo/OpenInv@4.2.0...4.2.1)

---
updated-dependencies:
- dependency-name: com.github.jikoo.OpenInv:openinvapi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump okhttp from 4.9.3 to 4.10.0 (#193)
dd270d9 
Bumps [okhttp](https://github.com/square/okhttp) from 4.9.3 to 4.10.0.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](square/okhttp@parent-4.9.3...parent-4.10.0)

---
updated-dependencies:
- dependency-name: com.squareup.okhttp3:okhttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump SongodaCore from 2.6.12 to 2.6.13 (#198)
ebd80f9 
Bumps SongodaCore from 2.6.12 to 2.6.13.

---
updated-dependencies:
- dependency-name: com.songoda:SongodaCore
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sandtechnology
Set release to 8 for java8
de50a7e
@dependabot
Bump MockBukkit-v1.18 from 2.22.2 to 2.85.2 (#207)
a66f940 
Bumps [MockBukkit-v1.18](https://github.com/MockBukkit/MockBukkit) from 2.22.2 to 2.85.2.
- [Release notes](https://github.com/MockBukkit/MockBukkit/releases)
- [Commits](MockBukkit/MockBukkit@v2.22.2...v2.85.2)

---
updated-dependencies:
- dependency-name: com.github.seeseemelk:MockBukkit-v1.18
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump placeholderapi from 2.11.1 to 2.11.2 (#203)
312b28e 
Bumps placeholderapi from 2.11.1 to 2.11.2.

---
updated-dependencies:
- dependency-name: me.clip:placeholderapi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump junit-jupiter-api from 5.8.2 to 5.9.0 (#209)
49c1596 
Bumps [junit-jupiter-api](https://github.com/junit-team/junit5) from 5.8.2 to 5.9.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.8.2...r5.9.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump SuperiorSkyblockAPI from 1.10.2 to 1.11.1 (#219)
10920ad 
Bumps SuperiorSkyblockAPI from 1.10.2 to 1.11.1.

---
updated-dependencies:
- dependency-name: com.bgsoftware:SuperiorSkyblockAPI
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sqlite-jdbc from 3.36.0.3 to 3.39.2.0 (#217)
3ada496 
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.36.0.3 to 3.39.2.0.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](xerial/sqlite-jdbc@3.36.0.3...3.39.2.0)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump LandsAPI from 6.5.1 to 6.8.3 (#216)
a8356b2 
Bumps [LandsAPI](https://github.com/Angeschossen/LandsAPI) from 6.5.1 to 6.8.3.
- [Release notes](https://github.com/Angeschossen/LandsAPI/releases)
- [Commits](IncrediblePlugins/LandsAPI@6.5.1...6.8.3)

---
updated-dependencies:
- dependency-name: com.github.angeschossen:LandsAPI
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump PlotSquared-Core from 6.8.1 to 6.9.3 (#210)
a290225 
Bumps [PlotSquared-Core](https://github.com/IntellectualSites/PlotSquared) from 6.8.1 to 6.9.3.
- [Release notes](https://github.com/IntellectualSites/PlotSquared/releases)
- [Commits](IntellectualSites/PlotSquared@6.8.1...6.9.3)

---
updated-dependencies:
- dependency-name: com.plotsquared:PlotSquared-Core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions @crowdin-bot
New Crowdin translations by Github Action (#201)
71c2210 
Co-authored-by: Crowdin Bot <[email protected]>
@sandtechnology
Try to fix sign issue
04d076f
sandtechnology and others added 29 commits July 22, 2023 18:04
@sandtechnology
Fix dbPrefix not handling none when using convert command
5a120a0
@sandtechnology
Fix build
2159288
@sandtechnology
Fix build again
a8858a4
@sandtechnology
Fix message for wrong displaying to owning shops in transfer
ac4573a
@sandtechnology
#394 Fix wrong event format copying after SPIGOT-7091: Update bungeec…
5941646 
…ord-chat

Introduce by https://github.com/SpigotMC/BungeeCord/pull/3344/files#diff-84a270b9ce33820f05d3564ab384e29478185dd8302836fbdc17ec17cd04b949R164
We use our own method to just press event, no sure if this should be open a pull request to upstream
@sandtechnology
Fix errors for pre spigot chat lib update
b1a7bbe
@sandtechnology
#395 update advanced-region-market deps to 3.5.4
55d9766
@dependabot
Bump com.github.angeschossen:LandsAPI from 6.29.12 to 6.35.0 (#399)
036108b 
Bumps com.github.angeschossen:LandsAPI from 6.29.12 to 6.35.0.

---
updated-dependencies:
- dependency-name: com.github.angeschossen:LandsAPI
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump com.sk89q.worldguard:worldguard-bukkit from 7.0.8 to 7.0.9 (#398)
4c1643f 
Bumps com.sk89q.worldguard:worldguard-bukkit from 7.0.8 to 7.0.9.

---
updated-dependencies:
- dependency-name: com.sk89q.worldguard:worldguard-bukkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump com.comphenix.protocol:ProtocolLib from 5.0.0 to 5.1.0 (#396)
741dd04 
Bumps com.comphenix.protocol:ProtocolLib from 5.0.0 to 5.1.0.

---
updated-dependencies:
- dependency-name: com.comphenix.protocol:ProtocolLib
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.10.0 (#387)
3e51785 
Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.0.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.9.2...r5.10.0)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump com.github.alex9849:advanced-region-market from 3.5.0 to 3.5.4 (#…
3434234 
…386)

Bumps com.github.alex9849:advanced-region-market from 3.5.0 to 3.5.4.

---
updated-dependencies:
- dependency-name: com.github.alex9849:advanced-region-market
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions @crowdin-bot
New Crowdin translations by Github Action (#370)
bb3e0c1 
Co-authored-by: Crowdin Bot <[email protected]>
@sandtechnology
Merge branch 'release' into master
86b6dc5
@sandtechnology
Merge remote-tracking branch 'origin/release'
8c8d643
@sandtechnology
Update Metrics code from bstats and fix typo
97afbca
@sandtechnology
Fix StackOverflow when appending components
9da14d2
@sandtechnology
Bump version
235f56f
@sandtechnology
Using varchar(128) for world name in database
42366bc
@sandtechnology
Replace Rollbar token
e55b4c9
@sandtechnology
Fix event append issue for custom item display
7a26cd8
@sandtechnology
Add 1.20.2 Support
7db62be
@sandtechnology
Fix typo for limit comment
7648020
@sandtechnology
Bump to 5.1.2.5
7554b78
@sandtechnology
Merge remote-tracking branch 'origin/release'
a216484 
# Conflicts:
#	pom.xml
@sandtechnology
Improve real display item message
e9e951f
@dependabot
Bump de.tr7zw:item-nbt-api-plugin from 2.11.3 to 2.12.0 (#403)
f7e92b2 
Bumps de.tr7zw:item-nbt-api-plugin from 2.11.3 to 2.12.0.

---
updated-dependencies:
- dependency-name: de.tr7zw:item-nbt-api-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump me.clip:placeholderapi from 2.11.2 to 2.11.4 (#404)
31c36a9 
Bumps me.clip:placeholderapi from 2.11.2 to 2.11.4.

---
updated-dependencies:
- dependency-name: me.clip:placeholderapi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.spigotmc:spigot-api (#405)
436ea53 
Bumps org.spigotmc:spigot-api from 1.20.1-R0.1-SNAPSHOT to 1.20.2-R0.1-SNAPSHOT.

---
updated-dependencies:
- dependency-name: org.spigotmc:spigot-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sandtechnology sandtechnology merged commit 63291ca into release Oct 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sandtechnology @Smudgge @YuanYuanOwO @SarahGreyWolf @crowdin-bot