Commit Graph

790 Commits

Author SHA1 Message Date
Jules
9727bacb5c Merge branch 'master' of https://Indyuce@git.lumine.io/mmoteam/mmoitems.git 2020-07-30 09:47:11 +02:00
Ethan
9332aeb17d Fixed dupe bug
Fixed null pointer error
Pray to build bot this builds...
2020-07-30 01:50:46 -04:00
Ethan
028b2161a2 Merge remote-tracking branch 'origin/master' 2020-07-30 00:02:06 -04:00
Ethan
e1817e8863 Added output-item and silent-craft options for crafting station recipes.
Examples (Under the options: tab in a recipe.):
output-item: false > This makes it so only the triggers activate for an item craft, still requires an item under the output tab to display as an icon.
silent-craft: true > Whenever a craft is completed it will not make a noise to the player, good for the sound trigger.
2020-07-30 00:01:53 -04:00
Jules
6048665188 !Give command cleanup 2020-07-29 12:05:07 +02:00
Jules
2b955de729 Added parent crafting stations 2020-07-29 11:25:03 +02:00
Jules
2e99b03387 Merge branch 'master' of https://Indyuce@git.lumine.io/mmoteam/mmoitems.git 2020-07-29 10:57:40 +02:00
Ethan
a963dde0a0 Added Command, Message, and Sound Triggers for crafting stations.
Examples:
message{format="&aHello %player%... "}
command{format="say Hello %player%"}
sound{sound=BLOCK_ANVIL_USE;volume=1;pitch=1}
2020-07-29 02:32:38 -04:00
Joshua
66b6077a77 Fixed All Air Crafting Bug 2020-07-28 20:18:14 -05:00
Jules
1132633cde !Fixed imports 2020-07-28 19:13:05 +02:00
Administrator
54db0fcc9a Add new file 2020-07-27 21:55:33 -07:00
Administrator
a5a2772bec Update .gitlab-ci.yml 2020-07-27 21:53:17 -07:00
Administrator
511d69f1ef Update .gitlab-ci.yml 2020-07-27 21:21:46 -07:00
Ashijin
d66f641bd8 Testing build bot 2020-07-27 21:54:27 -06:00
Ashijin
a85dec0f2b Testing build bot 2020-07-27 21:52:43 -06:00
Ethan
515bfc48e2 Adds unstackable boolean stat. 2020-07-27 20:59:51 -04:00
Ethan
8543632a2f Added profession requirement stat.
Add to lore-format.yml "- '#profession-<NAME OF PROFESSION>#'"
Add to stats.yml "profession-<NAME OF PROFESSION>: '&e<NAME OF PROFESSION> Level: &c#'"
Add to messages.yml "not-enough-profession: 'You aren''t high enough #profession# level!'"
2020-07-27 01:56:52 -04:00
Ethan
16596bb10d !Changed import to whole package. 2020-07-27 01:52:55 -04:00
Ethan
81403fe77d Added %mmoitems_stat_defense_percent% placeholder
Updated lib.
2020-07-26 02:46:47 -04:00
Ethan
f76e93b5bb Added defense stat, requires latest mmolib to function.
Add to lore-format.yml '- '#defense#''

Add to stats.yml 'defense: '&7■ Defense: &f<plus>#''
2020-07-26 01:30:39 -04:00
Joshua
ec859807a9 !Clarified something on the vanilla eating animation stat to prevent further confusion. 2020-07-25 23:17:36 -05:00
Ethan
ca0da305e4 !Hopefully final test commit. 2020-07-25 03:09:09 -04:00
Ethan
032eb18c7a !Removed .idea and added it to gitignore. 2020-07-25 00:07:06 -07:00
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