1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

2196 Commits

Author SHA1 Message Date
RoboMWM
1b497043dc Use jitpack for exoticgarden dependency, add maven repo for coreprotect
#coreprotect on EsperNet:
[13:39:10] RoboMWM: ayyyy Intelli is it ok for me 2 host ur coreprotect
on a maven repo
[13:40:40] @Intelli: It's fine to redistribute the JAR file, yes.
[13:40:53] RoboMWM: coolio, thanks
[13:41:15] @Intelli: np
2017-07-28 13:57:12 -07:00
TheBusyBiscuit
c437768c0b Merge pull request #372 from MLG-Fortress/mavenize
"mavenize"
2017-07-27 21:23:38 +02:00
RoboMWM
38e4307ae1 "mavenize" 2017-07-27 10:21:36 -07:00
TheBusyBiscuit
43e2d66f36 Fixed Ressearches 2017-07-21 11:50:59 +02:00
TheBusyBiscuit
4470d34555 Update plugin.yml 2017-07-14 12:02:32 +02:00
TheBusyBiscuit
2cbc093ce7 Merge pull request #342 from Poslovitch/doc-categories
Documented categories
2017-06-23 18:15:10 +02:00
Poslovitch
1f927ea13d Documented categories 2017-06-23 18:01:44 +02:00
TheBusyBiscuit
18e0f1477c Merge pull request #340 from Poslovitch/documentation
Documented and improved Researches
2017-06-23 13:49:58 +02:00
Poslovitch
24900b855a Fixed indentation and a useless static access 2017-06-23 13:13:22 +02:00
Poslovitch
bc53533ca4 Documented and improved Researches 2017-06-23 13:06:08 +02:00
TheBusyBiscuit
fce3b437a7 Fixed "Bytes of Code" 2017-06-22 23:03:54 +02:00
TheBusyBiscuit
e7593aaa16 Fixed SlimefunItem#getState() 2017-06-22 23:00:14 +02:00
TheBusyBiscuit
a5fec578fd Merge pull request #339 from Poslovitch/disabled
Added a State enum for SlimefunItem
2017-06-22 22:55:59 +02:00
Poslovitch
2aecee2492 Ticking check 2017-06-22 22:54:19 +02:00
Poslovitch
561caeaf51 Changed some checks 2017-06-22 22:49:36 +02:00
Poslovitch
b0d487fbc9 Fixed a useless check 2017-06-22 22:44:38 +02:00
Poslovitch
829fead370 More memory usage improvements 2017-06-22 22:39:19 +02:00
Poslovitch
911903e4a2 Less memory usage for "not unlocked" messages 2017-06-22 22:31:41 +02:00
Poslovitch
e388bf01f1 Added a State enum for SlimefunItem
Related to https://github.com/TheBusyBiscuit/Slimefun4/pull/337,
https://github.com/TheBusyBiscuit/Slimefun4/issues/231
2017-06-22 22:16:22 +02:00
TheBusyBiscuit
19af94c6ea Removed Memory Leaks 2017-06-22 16:43:49 +02:00
TheBusyBiscuit
c2f877b47c First Steps towards Item Hashing 2017-06-22 16:42:56 +02:00
TheBusyBiscuit
5900056016 Merge pull request #336 from Poslovitch/guide
Show the item display page when clicking on it in a machine's display recipes
2017-06-22 15:31:21 +02:00
Poslovitch
38a64adee7 Show the item display page when clicking on it in a machine's display recipes 2017-06-22 15:18:26 +02:00
TheBusyBiscuit
452bafd28f Merge pull request #335 from Poslovitch/msg
Little color fixes in messages
2017-06-22 14:29:10 +02:00
Poslovitch
cddaf1c1a6 Little color fixes in messages 2017-06-22 14:20:31 +02:00
TheBusyBiscuit
2053b3789e Merge pull request #331 from Poslovitch/autoenchanting-config
Added option to toggle "enchantability" of an item
2017-06-19 19:06:02 +02:00
Poslovitch
18779b114b Lightened some heavy calls in (dis)enchantable checks 2017-06-19 18:49:38 +02:00
Poslovitch
8910839e31 Forgot to push the isEnchantable() check in AutoEnchanter 2017-06-19 18:34:58 +02:00
Poslovitch
9a04d52df9 Added option to toggle "enchantability" of an item
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/280
2017-06-19 17:04:28 +02:00
TheBusyBiscuit
0c9324063a Merge pull request #330 from Poslovitch/give
Added an optional amount parameter for /sf give
2017-06-19 16:00:27 +02:00
Poslovitch
b3ec105ddc Removed unused import & modified messages 2017-06-19 15:58:32 +02:00
TheBusyBiscuit
c8d53baf59 Merge pull request #329 from Poslovitch/fireworks-give
Splited option to toggle fireworks into "when researched" & "when given"
2017-06-19 15:25:40 +02:00
Poslovitch
9d4f6879ea Added an optional amount parameter for /sf give
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/300
Also removed a useless online check, and adapted messages (may need the
owners to regenerate messages.yml file)
2017-06-19 14:51:32 +02:00
Poslovitch
1e9bb5e0a3 Splited option to toggle fireworks into "when researched" & "when given"
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/308
2017-06-19 14:14:26 +02:00
TheBusyBiscuit
4930d54795 Updated "Unsupported Version" message 2017-06-14 12:35:25 +02:00
TheBusyBiscuit
a7752d7ed4 Merge pull request #321 from Poslovitch/fireworks
Added option to toggle research fireworks
2017-06-14 11:47:43 +02:00
Poslovitch
710d74585d Added option to toggle research fireworks
Related to https://github.com/TheBusyBiscuit/Slimefun4/issues/308
2017-06-14 10:57:11 +02:00
TheBusyBiscuit
f1374d0923 Merge pull request #320 from John000708/master
1.12
2017-06-13 20:01:27 +02:00
John000708
4eed2e1b61 Remove bad code 2017-06-13 19:59:39 +02:00
John000708
7f52070e08 You did not see this 2017-06-13 19:33:53 +02:00
John000708
a471e4f93c Update Version 2017-06-13 19:32:53 +02:00
John000708
5d3c7b643e 1.12 Support 2017-06-13 19:28:54 +02:00
John000708
d67470dfab Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2017-06-13 16:09:36 +02:00
TheBusyBiscuit
f2c43b5d3e Merge pull request #304 from AlexLander123/fixes
Added unplaceable-blocks for BlockPlacer
2017-05-30 15:32:55 +02:00
AlexLander123
4a23613277 Added unplaceable-blocks for BlockPlacer 2017-05-30 17:14:11 +08:00
John000708
cf1850dec8 Update Branch 2017-05-28 20:37:59 +02:00
TheBusyBiscuit
9ae4baab44 Extend Backpack Fixes to Cooler 2017-05-02 15:38:20 +02:00
TheBusyBiscuit
42015cec8d Update plugin.yml 2017-04-30 08:54:39 +02:00
TheBusyBiscuit
f95b2823ee Merge pull request #274 from TheBusyBiscuit/revert-252-patch-2
Revert "Fixed Talisman of Anvil"
2017-04-30 08:52:34 +02:00
TheBusyBiscuit
bf080a2a15 Revert "Fixed Talisman of Anvil" 2017-04-30 08:52:19 +02:00