Commit Graph

1613 Commits

Author SHA1 Message Date
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
Roch
bc59bb1788 Craft repair cancelled 2022-10-25 17:22:36 +02:00
Jules
b7ba87b58d Merge branch '1015-mana-cost-30-0-not-working-properly-on-consumable' into 'master'
Mana cost stat implemented

See merge request phoenix-dvpmt/mmoitems!25
2022-10-25 13:30:14 +00:00
Roch
99c4464e4d Mana cost state implemented 2022-10-25 13:09:45 +02:00
Roch
47ff6fba42 MMOItems durability % fixed 2022-10-24 16:49:32 +02:00
Roch
a76bc04386 Issue fixed 2022-10-24 16:02:50 +02:00
Roch
f22960b068 Merge branch 'dev' into 725-repair-percent-is-not-work 2022-10-24 15:53:24 +02:00
Roch
932c35939a MythicLibs elements not working fixed
https://discord.com/channels/369891772010070021/1024797398612054026
2022-10-24 15:22:23 +02:00
Roch
7ad18474f6 Cleanup 2022-10-24 14:10:39 +02:00
Roch
04c2756a8c Repair power placeholder fixed 2022-10-24 12:45:55 +02:00
Roch
5ceae1f13e Git ignore 2022-10-24 12:20:53 +02:00
Roch
7b08206a09 Event cancelled 2022-10-24 12:17:48 +02:00
Roch
5e32f4cefb Code cleanup 2022-10-21 14:36:15 +02:00
Roch
67c7add6a7 Quick cleanup 2022-10-21 13:53:23 +02:00
Indyuce
8da95a78ff Fixed rev join 2022-10-18 11:45:09 +02:00
Indyuce
b141af1bcc Merge remote-tracking branch 'origin/master' 2022-10-16 21:59:23 +02:00
Indyuce
69d3f8a962 Added s placeholder to item cd message 2022-10-16 21:59:19 +02:00
Jules
59cb8594b4 Fixed an issue with skill loading 2022-10-15 12:55:57 +02:00
Indyuce
b1a2ae7cca Merge remote-tracking branch 'origin/master' 2022-10-02 13:23:54 +02:00
Indyuce
07078ef0cf More stats being unavailable to catalysts 2022-10-02 13:18:35 +02:00
Indyuce
ec8df89870 Catalysts are now upgradable 2022-10-02 13:15:22 +02:00
Indyuce
2fbc935c52 'Potion effects' no longer show for tipped arrows 2022-10-02 13:05:15 +02:00
Indyuce
dfa13fe137 Fixed unidentified items not display item tier 2022-10-02 13:04:53 +02:00
Indyuce
4cba417cce Fixed arrow potion effects 2022-10-02 12:36:47 +02:00
Indyuce
3b57c527b5 /mi take 2022-10-01 21:42:32 +02:00
Jules
36eee965ca Merge branch 'Tanerx-master-patch-67080' into 'master'
Update consumable.yml

See merge request phoenix-dvpmt/mmoitems!15
2022-10-01 19:36:37 +00:00
Indyuce
16a0a1ae14 MI player data now uncached on logout 2022-09-20 18:06:25 +02:00
Taner
79ec31bfcd Update MMOItems-Dist/src/main/resources/default/item/consumable.yml 2022-09-16 14:17:52 +00:00