Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,741 Commits 69 Branches 0 Tags 310 MiB
7e7046ec22
Commit Graph

1741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Roch Blonndiaux
192804f504 Adventure parser implementation 2022-12-07 14:58:50 +01:00
Indyuce
de7eb81ddf Fixed 'silent' param in /mi give 2022-12-02 17:49:04 +01:00
Indyuce
4a4227fe97 Fixed citizens dep 2022-11-14 10:56:11 +01:00
Indyuce
1608cdfca3 jenkins build 2022-11-14 00:28:41 +01:00
Roch Blonndiaux
6ea953702d Item type mini message format fixed 2022-11-09 17:35:08 +01:00
Roch Blonndiaux
d6017a4e88 Debug removed 2022-11-09 17:24:32 +01:00
Roch Blonndiaux
1878e7eb5c <tier-color> fixed 2022-11-09 17:02:29 +01:00
Roch Blonndiaux
5ed21155ea <tier-name> fixed 2022-11-09 16:50:25 +01:00
Roch Blonndiaux
077a4ce0ef <tier-color-cleaned> fixed 2022-11-09 16:43:26 +01:00
Indyuce
ecf8fda224 Kilos fix on gem stone dupe 2022-11-07 17:24:31 +01:00
Roch Blonndiaux
1bef5fa21e Bug fixed :))) 2022-11-07 12:47:36 +01:00
Roch Blonndiaux
bcdba5ca5d Event priority updated 2022-11-06 13:15:12 +01:00
Indyuce
23df2dfe2d More cleaning up 2022-11-05 13:31:39 +01:00
Indyuce
d2f144c4ed Removed recipe edition lore line 2022-11-05 13:14:49 +01:00
Indyuce
bb7ac9307a Recipe cleanup 2022-11-05 13:11:19 +01:00
Indyuce
1471923a2c Removed unused legacy custom recipes 2022-11-05 12:45:00 +01:00
Indyuce
29e38bd4a0 Removed func with string list stats till better implementation 2022-11-05 11:46:15 +01:00
Indyuce
39d68cfd74 Fixed an issue with action bar messages 2022-11-04 15:11:09 +01:00
Indyuce
a48041b756 Fixed an issue with custom dur 2022-11-04 14:33:17 +01:00
Indyuce
1eb8bde5d4 Fixed DeathDowngrading MiniMessage format support 2022-11-04 12:17:38 +01:00
Indyuce
e0d7a54522 Update ver nb 2022-11-04 10:48:29 +01:00
Indyuce
555c6e2284 Cleaned up custom block breaking 2022-11-03 19:12:00 +01:00
Indyuce
49d92288d8 Merge remote-tracking branch 'origin/1025-Custom-Block-Break-and-Drops-Error' 2022-11-03 18:12:44 +01:00
Indyuce
b62b303d5c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/ItemListener.java
 2022-11-03 18:11:32 +01:00
Jules
ea0ecb8d29 Merge branch '980-crafting-broken-tools-together-repairs-them-completely' into 'master' 
MMOItems repair system in crafting inventory

See merge request phoenix-dvpmt/mmoitems!32
 2022-11-03 17:10:12 +00:00
Indyuce
2e6bae16b5 Fixed shulker missile not working 2022-11-03 18:06:29 +01:00
Jules
aaa192d5d5 Merge branch '910-using-gems-on-items-with-elemental-attribute-makes-the-item-lose-the-elemental-attribute' into 'master' 
Fixed Elements' Tag - 910, 964, possibly 943, 1033, 899!

Closes #964 and #910

See merge request phoenix-dvpmt/mmoitems!27
 2022-11-03 17:03:38 +00:00
Jules
34f102fd3c Merge branch '725-repair-percent-is-not-work' into 'master' 
Vanilla & MMOItems items durability % fixed

See merge request phoenix-dvpmt/mmoitems!19
 2022-11-03 16:59:26 +00:00
Indyuce
0da5c6877c Merge remote-tracking branch 'origin/1019-bug-config-option-item-revision-keep-data-reroll-doesn-t-work' 
# Conflicts:
#	.gitignore
 2022-11-03 17:56:26 +01:00
Jules
d1ed762288 Merge branch 'elemental-damage-stacking-error-fix' into 'master' 
Fixes Stacking of Elements' Double Values - Noticed during fix of Elements tag testing!

See merge request phoenix-dvpmt/mmoitems!30
 2022-11-03 16:53:07 +00:00
Jules
dc4b98f597 Delete MMOItems-Dist.iml 2022-11-03 16:07:40 +00:00
Jules
5d02cb8ad1 Delete MMOItems-API.iml 2022-11-03 16:07:29 +00:00
Indyuce
c095ecaa91 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.gitignore
#	MMOItems-API/MMOItems-API.iml
#	MMOItems-Dist/MMOItems-Dist.iml
 2022-11-03 17:06:08 +01:00
Indyuce
67b37ee875 Fixed gitignore 2022-11-03 17:04:59 +01:00
Jules
04e009ee31 Merge branch '1020-bug-the-reforgeoptions-about-keepupgrades-doesn-t-work' into 'master' 
Reforge options max value caped

See merge request phoenix-dvpmt/mmoitems!33
 2022-11-03 15:59:05 +00:00
Roch Blonndiaux
2ba1c15b69 Maximum level bug fixed 2022-11-02 15:32:58 +01:00
Roch Blonndiaux
f3af637d79 MMOItems id check, durability error fixed and cancel on mc+mmo repair 2022-10-27 16:34:47 +02:00
Roch Blonndiaux
c7d38fb88e MMOItems craft repair 2022-10-27 16:08:35 +02:00
Roch
ecf884918f Durability check 2022-10-26 18:56:13 +02:00
Rosenthalk0
c750355383 Fixes Stacking of Elements' Double Values - Noticed during fix of Elements tag testing! 2022-10-25 15:19:23 -05:00
Rosenthalk0
165eb39714 #1025 - Fix Custom Block Drop / Breaking Power Bug 2022-10-25 14:53:24 -05:00
KingKilo
5824f6a3fe Fixed Elements 2022-10-25 19:32:00 +00:00
Jules
d4a30f90f6 Merge branch 'dev' into 'master' 
Code cleanup & mythiclibs elements loaded as stats

See merge request phoenix-dvpmt/mmoitems!24
 2022-10-25 16:28:18 +00:00