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
567 Commits 69 Branches 0 Tags 310 MiB
9addee2a9f
Commit Graph

567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ethan
9addee2a9f Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	.idea/misc.xml
#	.idea/vcs.xml
 2020-07-25 03:04:24 -04:00
Ethan
1b1cda5fd6 !I am only doing this because it's making me. 2020-07-25 03:04:07 -04:00
Ethan
4e76b550d2 !This is a test commit. Added oxford comma. 2020-07-25 01:25:41 -04:00
Ethan
cf61a95573 !This is a test commit. 2020-07-25 01:17:16 -04:00
Joshua
1701356e38 Test for the gitlab - just a simple config change. 2020-07-24 23:52:24 -05:00
ASangarin
5719442144 Added a check when using an upgradeable to check if the template exists. 2020-07-24 18:50:18 +02:00
Jules
a241949c55 !Cleanup 2020-07-24 11:41:47 +02:00
ASangarin
9d4347ee28 - merge 2020-07-21 17:12:13 +02:00
ASangarin
c10dfb7497 yet another attempt at preventing crafting if item can't stack 2020-07-21 17:11:53 +02:00
Indyuce
c800872fb6 Support for Iridescent 2020-07-20 18:08:45 +02:00
Indyuce
a1b4b1aff1 Small cleanup 2020-07-20 17:52:00 +02:00
Indyuce
f193fdd706 Merge branch 'master' of 
http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git

Conflicts:
	lib/MMOCore.jar
	src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreMMOLoader.java
 2020-07-20 16:25:38 +02:00
Indyuce
bf6c986ba4 Added random items to MMOCore drop tables 2020-07-20 16:22:49 +02:00
ASangarin
6ff3acdd75 prevents crafting if the current item can't be stacked any further 
(not tested)
 2020-07-20 16:21:30 +02:00
Indyuce
49cd441d71 Support for TrHologram 2020-07-20 16:08:44 +02:00
ASangarin
8b8dd9282a 5.5.4 2020-07-20 16:07:06 +02:00
ASangarin
18823fa6bd test 2020-07-20 16:04:27 +02:00
Indyuce
f3443a49bd MMOPlayerData refactor 
Please use this version of MMOLib
https://github.com/mmopluginteam/mmolib/releases/tag/1.2.5
 2020-07-20 15:44:50 +02:00
Indyuce
a864b94aa8 Update plugin.yml 2020-07-19 18:56:21 +02:00
Indyuce
5f70618219 Update ver number 2020-07-19 18:52:54 +02:00
ASangarin
9a96c4942b No need for these 2020-07-18 18:25:36 +02:00
ASangarin
de1297c5ac testing 2020-07-18 17:49:01 +02:00
ASangarin
49f61f69b5 Invalid recipes no longer throw an exception and are just ignored 
(meaning they won't affect loading/appear in game.
They will still error in the log)
 2020-07-12 18:49:17 +02:00
Indyuce
a8cf3f5190 !Compatibility with very latest MMOLib 2020-07-12 16:26:02 +02:00
Indyuce
d01976a314 Right click the chest in the edition inv to reroll the item stats 2020-07-12 15:33:35 +02:00
Indyuce
48f1e7c907 Added error message 2020-07-12 15:33:24 +02:00
Indyuce
8754d4e76e Merge branch 'master' of http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git 2020-07-12 15:12:27 +02:00
Indyuce
001c14e036 External stats now work in item set bonuses 2020-07-12 15:12:14 +02:00
Indyuce
5f55ec6adf Small cleanup 2020-07-12 15:11:30 +02:00
Ashijin
fbecc26db6 Testing build bot 2020-07-10 18:17:39 -06:00
Ashijin
db443f6bde Testing build bot 2020-07-10 18:14:04 -06:00
Ashijin
1b1d7d2d3d Testing build bot 2020-07-10 18:08:29 -06:00
Ashijin
e1f03f66ab Testing build bot 2020-07-10 18:00:46 -06:00
Ashijin
b6d778c9ed Testing build bot 2020-07-10 17:56:18 -06:00
ASangarin
b9bb29b559 Recipes can now have amounts 
You can also specify the amount of the crafted output using a new item
stat
 2020-07-10 22:59:39 +02:00
Indyuce
a282bc1b30 Changed hologram event priority to MONITOR 2020-07-10 14:29:29 +02:00
Indyuce
9a40e86b14 !Improved performance of lightning staff 2020-07-07 15:58:48 +02:00
Indyuce
835fd9a92d Fixed compatibility with WG keep-inventory flag 2020-07-07 15:43:14 +02:00
Indyuce
f420c7eb5d Merge branch 'master' of http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git 2020-07-07 15:33:19 +02:00
Indyuce
0524bf9ca8 Removed useless messages, added translation for 'Recipe Preview' 2020-07-07 15:33:10 +02:00
Jules
3ed88704f4 Fixed comp with MMOCore 2020-07-06 18:04:25 +02:00
Jules
af0e158746 Added item gen templates options 2020-07-06 17:53:52 +02:00
ASangarin
1e8bfe8856 Fixed the MMOCore experience crafting trigger 2020-07-05 16:27:38 +02:00
Indyuce
512145007e Merge branch 'master' of http://Indyuce@dev.lumine.io/bitbucket/scm/mmo/mmoitems.git 2020-07-04 14:27:32 +02:00
Indyuce
d08a36a2d8 Fixed an issue with gen templates 2020-07-04 14:27:24 +02:00
Indyuce
f25a70eac2 Added an error message when vein size/count is 0 2020-07-04 14:20:51 +02:00
Indyuce
e324a296ff Updated lib 2020-07-04 14:20:29 +02:00
ASangarin
ec14e3f378 gave vanilla tools a pickaxe power value: 
Wood: 5
Stone: 10
Gold: 15
Iron: 20
Diamond: 25
Netherite: 30
 2020-07-02 19:18:27 +02:00
ASangarin
71113603ea 5.5.1 2020-06-27 01:07:39 +02:00
ASangarin
5dc5677030 MMOItems 5.5.1 - The Colorful Update 
You can now use hex colors with most things!
The format is '<#xxxxxx>' and it works just like the old '&x' did.
The old format is still supported and sometimes they can even be mixed!

Requires MMOLib 1.2.3 or later
 2020-06-27 00:59:59 +02:00