Skip to content

Commit

Permalink
Merge pull request #1513 from Ghost-chu/hikari
Browse files Browse the repository at this point in the history
6.1.0.1
  • Loading branch information
Ghost-chu authored Apr 17, 2024
2 parents ef725e1 + 51d4429 commit ae271ba
Show file tree
Hide file tree
Showing 56 changed files with 73 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .run/quickshop-hikari update version.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<option name="goals">
<list>
<option value="versions:set"/>
<option value="-DnewVersion=6.1.0.0-SNAPSHOT"/>
<option value="-DnewVersion=6.1.0.1"/>
</list>
</option>
<option name="multimoduleDir"/>
Expand Down
2 changes: 1 addition & 1 deletion addon/bluemap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/discordsrv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/discount/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/displaycontrol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/dynmap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/limited/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/list/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/plan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/reremake-migrator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion addon/shopitemonly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.addon</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/advancedregionmarket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/angelchest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/bentobox/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/bungeecord-geyser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/bungeecord/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/chestprotect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/clearlag/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/ecoenchants/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/elitemobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/griefprevention/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/itemsadder/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/lands/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/openinv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/plotsquared/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/reforges/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/residence/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/slimefun/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/superiorskyblock/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/towny/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/velocity/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/voidchest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/worldedit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compatibility/worldguard/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>com.ghostchu.quickshop.compatibility</groupId>
Expand Down
8 changes: 4 additions & 4 deletions crowdin/lang/de-DE/messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ player-bought-from-your-store-tax: <green>{0} hat {1} {2} von deinem Shop gekauf
not-enough-space: <red>Du hast nur Platz für <yellow>{0}</yellow> weitere!
shop-name-success: <green>Shopname erfolgreich geändert zu <yellow>{0}</yellow>.
shop-staff-added: <yellow>{0} <yellow>wurde erfolgreich als Shopmitarbeiter zu deinem Shop hinzugefügt.
shop-staff-empty: <yellow>This shop have no staff members.
shop-staff-empty: <yellow>Dieser Shop hat keine Mitarbeiter.
shops-recovering: Stelle Shops von Backups wieder her...
virtual-player-component-hover: "<gray>Dies ist ein virtueller Spieler.\n<gray>Bezieht sich auf ein Systemkonto mit dem selben Namen.</gray>\n<green>UUID: <yellow>{0}</yellow>\n<green>Benutzername: <yellow>{1}</yellow>\n<green>Angezeigt als: <yellow>{2}</yellow>"
real-player-component-hover: "<gray>Dies ist ein echter existierender Spieler.\n<green>UUID: <yellow>{0}</yellow>\n<green>Benutzername: <yellow>{1}</yellow>\n<green>Angezeigt als: <yellow>{2}</yellow>\n<gray>Wenn du ein virtuelles Systemkonto mit demselben Namen verwenden willst, füge <dark_gray>\"[]\"</dark_gray> an beiden enden des Namens hinzu: <dark_gray>[{1}]</dark_gray>."
Expand Down Expand Up @@ -287,7 +287,7 @@ unknown-owner: Unbekannt
restricted-prices: '<red>Eingeschränkter Preis für {0}: Mindestens {1}, maximal {2}'
nearby-shop-this-way: <green>Shop ist {0} Blöcke von dir entfernt.
owner-bypass-check: <yellow>Alle Prüfungen wurden umgangen. Handel erfolgreich! (Sie sind jetzt der Besitzer des Ladens!)
april-rick-and-roll-easter-egg: "<hover:show_text:'Click to open in browser for time limited rewards!'><click:open_url:'https://www.youtube.com/watch?v=dQw4w9WgXcQ'><green>Click here to acquire your time limited rewards that provided by QuickShop-Hikari developer!</green></click></hover>"
april-rick-and-roll-easter-egg: "<hover:show_text:'Anklicken um im Browser zu öffnen für eine limitierte Belohnung!'><click:open_url:'https://www.youtube.com/watch?v?dQw4w9WgXcQ'><green>Klicke hier um eine limitierte Belohnung von den QuickShop-Hikari Entwicklern zu erhalten!</green></click></hover>"
signs:
item-right: ''
out-of-space: Kein Platz
Expand Down Expand Up @@ -445,8 +445,8 @@ command:
benefit: <yellow>Einstellungen zum aufteilen von Vorteilen zwischen Schobeigentümer und anderen Spielern
tag: <yellow>Shop-Tags hinzufügen, entfernen oder abfragen
suggestprice: <yellow>Empfiehlt einen Preis für den angesehenen Shop, basierend auf anderen Shops
history: <yellow>View the history transactions of a shop
sign: <yellow>Change the sign material of a shop
history: <yellow>Zeige den Transaktionsverlauf eines Shops
sign: <yellow>Ändere das Material des Schildes eines Shops
bulk-size-not-set: '<red>Verwendung: /qs size <Anzahl>'
no-type-given: '<red>Verwendung: /qs find <item>'
feature-not-enabled: Dieses Feature ist nicht in der Config Datei aktiviert.
Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-interface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-paper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-spigot-abstract/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-spigot-v1_18_R1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-spigot-v1_18_R2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion platform/quickshop-platform-spigot-v1_19_R1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.ghostchu</groupId>
<artifactId>quickshop-hikari</artifactId>
<version>6.1.0.0-SNAPSHOT</version>
<version>6.1.0.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit ae271ba

Please sign in to comment.