Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-01-05 06:57:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,684 Commits 69 Branches 0 Tags 310 MiB
56bc8ba551
Commit Graph

1684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jules
56bc8ba551 Merge remote-tracking branch 'origin/master' 2023-01-25 18:19:34 +01:00
Jules
37f497de72 Merge branch 'custom-stats' into 'master' 
Custom stats

See merge request phoenix-dvpmt/mmoitems!46
 2023-01-25 13:57:58 +00:00
Jules
207411fc87 Fixed validation error on crossbows 2023-01-25 14:51:00 +01:00
Jules
d11cee182d Fixed percent repair power 2023-01-25 14:47:35 +01:00
Jules
0a9c7b817e Merge branch 'nexus-repo-readme-update' into 'master' 
Update README.md

See merge request phoenix-dvpmt/mmoitems!49
 2023-01-25 13:39:26 +00:00
Jules
39df4e6958 Merge branch '1126-update-revision-id-is-not-updated-lore' into 'master' 
Reforge event cancel removed

See merge request phoenix-dvpmt/mmoitems!50
 2023-01-25 13:38:57 +00:00
Roch Blonndiaux
db6f48d4ca Reforge event cancel removed 2023-01-17 11:57:58 +01:00
Roch Blondiaux
3a0f7e8651 Update README.md 2023-01-16 14:45:52 +00:00
Taner
124f441ccd Revert "Update DoubleStat.java" 
This reverts commit 79cea0c65a
 2023-01-14 06:46:41 +00:00
Taner
79cea0c65a Update DoubleStat.java 2023-01-14 06:42:16 +00:00
Roch Blonndiaux
e945d4ca01 Additional warning 2023-01-11 14:58:01 +01:00
Roch Blonndiaux
ce4fbf6321 Reload & code cleanup 2023-01-11 14:44:49 +01:00
Roch Blonndiaux
e442d030ad Lore option & some more documentation 2023-01-11 13:48:52 +01:00
Roch Blonndiaux
0c69a4d259 Documentation & lore translations 2023-01-11 13:25:11 +01:00
Roch Blonndiaux
85ebca48dc Custom stats 2023-01-11 13:14:10 +01:00
Jules
a793b80211 Deployment 2023-01-09 00:41:34 +01:00
Indyuce
d14edbfeb8 Update ver nb 2022-12-29 14:59:30 +01:00
Indyuce
45d935f498 Removed debug msg 2022-12-29 14:57:20 +01:00
Indyuce
94f70d4644 Cleaned up item reforger 2022-12-29 14:35:02 +01:00
Indyuce
1a5dcbc830 Fixed placeholders 2022-12-29 14:11:09 +01:00
Indyuce
cc0fe8e197 using latest version of ML 2022-12-27 14:54:57 +01:00
Indyuce
2123f9f430 OP stats that no one can edit. 2022-12-26 00:56:00 +01:00
Indyuce
1b4966926e Removed last use of components 2022-12-26 00:53:39 +01:00
Indyuce
c0dc58a903 Update ver nb 2022-12-23 18:24:13 +01:00
Indyuce
10362c358b Hide modifiers in GUIs 2022-12-23 12:40:42 +01:00
Indyuce
0993b6face Merged adventure 2022-12-23 00:13:45 +01:00
Indyuce
6650527584 Compiles on java 8 2022-12-22 23:06:38 +01:00
Indyuce
b53a21dbe5 Removed use of components 2022-12-22 16:12:18 +01:00
Roch Blonndiaux
f070ebd1c4 Merge conflicts resolved 2022-12-22 14:46:37 +01:00
Indyuce
b9b61b1616 Merge remote-tracking branch 'origin/adventure-like-impl' 
# Conflicts:
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
 2022-12-22 12:30:40 +01:00
Indyuce
192f997ff3 Fixed the 'placeholder' recipe condition 2022-12-22 00:24:08 +01:00
Indyuce
021813b57e Fixed item set particles 2022-12-22 00:02:55 +01:00
Indyuce
1120222e91 FIxed 'amount' in MI trigger 2022-12-21 19:11:26 +01:00
Roch Blonndiaux
129a51a9a9 Kyori adventure methods replacement 2022-12-21 11:58:25 +01:00
Roch Blondiaux
46fc12fee6 Merge branch 'master' into 'adventure-like-impl' 
# Conflicts:
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#   MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
 2022-12-21 10:54:34 +00:00
Indyuce
dc27148c30 Fixed wave lute eff 2022-12-21 00:22:21 +01:00
Indyuce
0bb66bd2b2 Fixed projectile particles for lutes 2022-12-21 00:19:51 +01:00
Indyuce
76877b0eb6 Fixed /mi list 2022-12-21 00:19:37 +01:00
Indyuce
e97036ab7b Custom repairs are now comp with MMOCore 2022-12-20 12:25:44 +01:00
Indyuce
640fc62119 Fixed an issue with ornaments; improved comp with MMOInv 2022-12-17 16:46:16 +01:00
Indyuce
0e8e358abb Fixed login event priority 2022-12-17 14:44:24 +01:00
Indyuce
39b10b8af8 Merge remote-tracking branch 'origin/adventure-like-impl' 
# Conflicts:
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/item/util/crafting/CraftingRecipeDisplay.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/gui/ItemBrowser.java
#	MMOItems-API/src/main/java/net/Indyuce/mmoitems/stat/DisplayName.java
 2022-12-17 14:14:28 +01:00
Indyuce
ffb83a64f9 Merge remote-tracking branch 'origin/1007-stations-hex-problem' 2022-12-15 12:25:58 +01:00
Indyuce
54a049e64f Merge remote-tracking branch 'origin/926-hex-colors-not-working-with-tier-color' 2022-12-15 12:25:40 +01:00
Indyuce
59f1b4261b Merge remote-tracking branch 'origin/1018-playerjoinevent' 
# Conflicts:
#	MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ItemListener.java
 2022-12-15 12:24:23 +01:00
Roch Blonndiaux
0c2a5f2514 Italic issue fixed 2022-12-13 15:45:36 +01:00
Roch Blonndiaux
b2fd6d8834 Craft station preview items patched 2022-12-08 17:06:43 +01:00
Roch Blonndiaux
96d02969fd Stations name placeholders patched 2022-12-08 16:33:13 +01:00
Roch Blonndiaux
d2ad83e218 Stations name update 2022-12-07 16:05:54 +01:00
Roch Blonndiaux
5e55049369 Tier placeholders fix 2022-12-07 15:59:27 +01:00