1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

404 Commits

Author SHA1 Message Date
Poslovitch
1d901c940f Fixed IllegalArgumentException when try to push null item from a ReactorAccessPort
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/338
2017-08-12 16:26:19 +02:00
TheBusyBiscuit
bbf4b5ed85 Merge pull request #387 from Poslovitch/297-fix
Fixed radioactive items giving effects even if they were disabled
2017-08-12 16:18:06 +02:00
Poslovitch
29ce4c428a Use #isEnabled() instead of #getWhitelist() 2017-08-12 16:08:50 +02:00
TheBusyBiscuit
cf9826a2d6 Merge pull request #388 from Poslovitch/blistering-ingot-research
Added a research for blistering ingots
2017-08-12 15:48:16 +02:00
TheBusyBiscuit
190cdaddd9 Merge pull request #385 from Poslovitch/380-fix
Fixes Fortune V impossible to be obtained using Wizard Talisman
2017-08-12 15:42:28 +02:00
TheBusyBiscuit
54b8f59ccd Merge pull request #386 from Poslovitch/366-fix
Fixes IllegalArgumentException caused by a mis-handled negative bound in randomizer
2017-08-12 15:22:41 +02:00
Poslovitch
bd7b7c7ca0 Fixed an error my IDE didn't notice me 2017-08-12 15:21:29 +02:00
Poslovitch
00ef07b0bb Added a research for blistering ingots 2017-08-12 15:18:05 +02:00
Poslovitch
9f9252991c Fixed radioactive items giving effects even if they were disabled
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/297
2017-08-12 14:28:34 +02:00
Poslovitch
b3e3160f73 Fixes a missing bracket 2017-08-12 13:27:58 +02:00
Poslovitch
00adbf84d7 Fixed SlimefunStartup#randomize(int) and #chance(int, int) 2017-08-12 13:24:16 +02:00
Poslovitch
ad3f52fe5a Fixes Fortune V impossible to be obtained using Wizard Talisman
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/380
2017-08-12 13:18:20 +02:00
Poslovitch
0b54f079e4 Fixes a NumberFormatException when trying to read inexistant frequency of a CargoManager
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/363
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/161
2017-08-10 17:02:38 +02:00
Poslovitch
c3e9717bdb Fixes IllegalArgumentException with negative randomize bound with Magician Talisman
Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/366
2017-08-10 15:47:56 +02: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
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
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
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
Poslovitch
cddaf1c1a6 Little color fixes in messages 2017-06-22 14:20:31 +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
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
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
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
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
bf080a2a15 Revert "Fixed Talisman of Anvil" 2017-04-30 08:52:19 +02:00
TheBusyBiscuit
32e312b422 Updated plugin.yml 2017-04-25 18:46:21 +02:00
VoidAngel
bc00c685d7 Removed uneeded import 2017-04-25 09:19:34 -07:00
VoidAngel
6af5a83ca5 Removed redundant code 2017-04-25 09:18:39 -07:00
VoidAngel
1c04e66b65 Fixed typo 2017-04-25 09:16:25 -07:00
VoidAngel
a76137aa2b Update BackpackListener.java 2017-04-25 08:23:22 -07:00
VoidAngel
41d462b265 Update SlimefunSetup.java 2017-04-25 08:21:15 -07:00
VoidAngel
a90028b6d6 Update ElectrifiedCrucible.java 2017-04-25 08:17:38 -07:00
VoidAngel
f59884455a Backpack fixes v2
Fixes:
- Backpacks getting stuck in backpacks with number keys.
- Putting shulker boxes inside backpacks for infinite storage.
- A dupe where a player would drop the backpack at the same time as opening it.
2017-04-24 15:41:25 -07:00
VoidAngel
b415032dea Backpack fixes 2017-04-24 15:35:02 -07:00
VoidAngel
10e343be71 Fixed electric crucible inconsistency
Hardened clay will now make water instead of lava (As the recipe is in the manual crucible)
2017-04-24 10:47:48 -07:00
VoidAngel
8ecdec0491 Crucible fix
Fix for the hardened_clay crucible recipe and prevent block place on use
2017-04-24 10:43:12 -07:00
VoidAngel
c5f110dca4 Added backpack already open message 2017-04-21 10:01:38 -07:00
VoidAngel
f1a8816bfa Prevent possible backpack dupes
This will prevent dupes from arising if a player obtains 2 of the same backpack from staff error, flukes, past exploits, etc.
2017-04-21 09:59:59 -07:00
TheBusyBiscuit
b882926fd5 Merge pull request #261 from VoidAngel/master
Fix backpack dupe (And all similar dupes)
2017-04-20 22:53:57 +02:00
VoidAngel
7c50fd691b Fix backpack dupe (And all similar dupes) 2017-04-20 11:23:29 -07:00
DeathlyPanda
07ac226556 Fixed Talisman of Anvil
Issue was posted in: https://github.com/TheBusyBiscuit/Slimefun4/issues/229
2017-04-14 20:29:54 -04:00
DeathlyPanda
5d8b0e4ddb Simplified Patch 2017-04-14 18:25:02 -04:00
DeathlyPanda
52d42a5744 Fix Pickaxe of Vein Mining Dupe
Fixed pickaxe to prevent duplication of ores.
2017-04-13 09:42:07 -04:00
TheBusyBiscuit
ebfc6f418c Fixed Round-Robin Mode for Cargos 2017-04-10 10:08:06 +02:00
TheBusyBiscuit
3d21dae93c Reverted failed fix 2017-04-10 10:00:26 +02:00
TheBusyBiscuit
45554ce457 Fixed Cargo Round-Robin Mode 2017-04-10 09:57:58 +02:00
TheBusyBiscuit
5590118a52 Added elses 2017-04-10 09:46:21 +02:00
TheBusyBiscuit
1962dbb0a5 Chain Armor no longer spams messages 2017-04-09 09:59:45 +02:00
TheBusyBiscuit
f751eafc86 Fixed Jet Boots Recipe 2017-04-09 09:46:05 +02:00
TheBusyBiscuit
4b44c347fe Removed deprecated code snippet 2017-04-09 09:44:37 +02:00
TheBusyBiscuit
10d87d37b3 Fixed Backpack Crafting 2017-04-08 19:19:29 +02:00
TheBusyBiscuit
93b209bb36 Updated Version 2017-04-08 19:13:26 +02:00
TheBusyBiscuit
8ebae91e36 You can now upgrade Backpacks 2017-04-08 19:13:06 +02:00
John000708
e98c66544f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2017-04-04 19:53:59 +02:00
TheBusyBiscuit
4650b92947 Added Addons amount to /sf versions 2017-04-02 11:09:52 +02:00
TheBusyBiscuit
af6ec415b0 Maybe made the Block Storage stuff safer, idk 2017-03-31 14:47:43 +02:00
TheBusyBiscuit
e3e3e67720 Safe Handler 2017-03-27 16:14:52 +02:00
TheBusyBiscuit
c88ddcc592 Updated Version 2017-03-26 09:32:42 +02:00
TheBusyBiscuit
b901f885fa Fixed Block Inventories 2017-03-26 09:31:27 +02:00
TheBusyBiscuit
9f5b629c43 Updated Version 2017-03-24 14:08:48 +01:00
TheBusyBiscuit
fc00c5356c Fixed CSCoreLibLoader 2017-03-24 14:04:38 +01:00
TheBusyBiscuit
b6589d49f1 Updated /sf versions 2017-03-20 15:24:29 +01:00
TheBusyBiscuit
3ca993175e Fixed missing chunks file 2017-03-19 20:20:25 +01:00
John000708
07dbfbd318 Cargo Nodes now listen for canAccessChest() 2017-03-19 17:27:16 +01:00
John000708
4871a17f2d Prevent message spamming from vanilla items 2017-03-19 13:52:08 +01:00
TheBusyBiscuit
abc808b95b Added SlimefunItem#isAddonItem() 2017-03-18 19:34:52 +01:00
Mason
552af5d9cd Added Trash Can 2017-03-15 05:53:34 -04:00
Mason
b67a50b2d1 Added Cargo Management 2017-03-15 05:50:00 -04:00
TheBusyBiscuit
5b84d0f261 Fixed FileNotFoundException: chunks.sfc 2017-03-14 16:28:15 +01:00
TheBusyBiscuit
73cdbf114b Fixed Inventory Saving 2017-03-14 16:26:17 +01:00
TheBusyBiscuit
e69fa679dc Merge pull request #172 from John000708/master
Fixed Multimeter not showing with colors
2017-02-28 08:42:29 +01:00
John000708
5c47a3f4fe Fixed Multimeter not showing with colors 2017-02-24 19:45:36 +01:00
TheBusyBiscuit
ab14aa7a48 Merge pull request #136 from John000708/master
Feature Additions
2017-02-06 20:40:57 +01:00
John000708
4c5f7d5766 Fixed Shulker Boxes not dropping with contents in them 2017-02-06 19:56:37 +01:00
John000708
0d2ff61387 Added CoreProtect logging for the Explosive Pickaxe 2017-02-06 19:28:06 +01:00
John000708
de4f779a64 Added EmeraldEnchants limit to AutoEnchanter.
Started "documenting" the API
2017-02-06 18:23:11 +01:00
TheBusyBiscuit
83426277d3 Update plugin.yml 2017-02-05 10:48:52 +01:00
John000708
d819e1d6bc Added an option to allow normal creative researching 2017-02-04 21:54:01 +01:00
TheBusyBiscuit
69fc66859e Fixed Contributors list not resetting 2017-02-04 21:03:51 +01:00
TheBusyBiscuit
ba6a6507e5 New Guide Design, added Cheat Sheet, new Settings GUI 2017-01-31 11:08:17 +01:00
TheBusyBiscuit
e731bf20aa Call ChestManipulator on withdraw() 2017-01-23 12:55:58 +01:00
TheBusyBiscuit
b08f5b9892 Added ChestManipulator 2017-01-23 12:52:14 +01:00
TheBusyBiscuit
485319a2f9 Fixed XP duplication 2017-01-21 08:30:41 +01:00
TheBusyBiscuit
73210d0a99 Fixed Message 2017-01-21 08:29:03 +01:00
AlexLander123
b99b396902 Fix XP Dupe Bug 2017-01-20 23:57:19 +08:00
TheBusyBiscuit
dfaa90a053 test 2017-01-19 18:29:04 +01:00
TheBusyBiscuit
0b4127d7d3 Added WikiSetup.class 2017-01-19 18:26:56 +01:00
TheBusyBiscuit
c5f0770827 Fixed GuideHandler Runnables 2017-01-18 15:51:14 +01:00
TheBusyBiscuit
f313014c70 Fixed GuideHandler Runnables 2017-01-18 15:47:51 +01:00
TheBusyBiscuit
d8c8e0f2e3 Fixed Addons List 2017-01-18 15:39:03 +01:00
TheBusyBiscuit
c7b47bd934 Added /sf versions 2017-01-18 15:37:00 +01:00
TheBusyBiscuit
8609a1cd38 Fixed Small Armor Stands 2017-01-18 15:26:46 +01:00
TheBusyBiscuit
a435545aa5 Start Delay for GitHub Task 2017-01-18 12:45:28 +01:00
TheBusyBiscuit
1c94e66898 GitHub Queries are now repeating 2017-01-18 12:44:12 +01:00
TheBusyBiscuit
70d28b8ac4 Added "last update" value 2017-01-18 12:40:17 +01:00
TheBusyBiscuit
94cbf18371 Changed Format 2017-01-18 12:18:10 +01:00
TheBusyBiscuit
0cd1936966 Changed Format 2017-01-18 12:16:25 +01:00
TheBusyBiscuit
855e6c19b8 More GitHub Integration 2017-01-18 12:14:01 +01:00
TheBusyBiscuit
a1c9195312 Changed Guide Default View 2017-01-17 16:38:47 +01:00
TheBusyBiscuit
0bf99d6974 Fixed double messages 2017-01-17 16:37:55 +01:00
TheBusyBiscuit
d66dc68311 Improved Guide Settings Menu 2017-01-16 20:31:57 +01:00
TheBusyBiscuit
692ea87b4a Menu Reposition 2017-01-16 16:30:26 +01:00
TheBusyBiscuit
3dd3cd7d69 More GitHub Integration 2017-01-16 16:28:41 +01:00
TheBusyBiscuit
20c3478bad Do not display Settings in Cheat Mode 2017-01-15 20:01:20 +01:00
TheBusyBiscuit
95f0dfa41b Added GitHub API Integration to retrieve proper credits 2017-01-15 19:17:02 +01:00
TheBusyBiscuit
ccf5fd351d // TODO 2017-01-14 22:45:06 +01:00
BuildTools
f822bc961b Solved Conflicts 2017-01-14 22:43:44 +01:00
TheBusyBiscuit
d0462f8f80 Guide Changes 2017-01-14 22:40:06 +01:00
TheBusyBiscuit
1a7af859e5 Merge pull request #94 from NathanAdhitya/master
Minor Fixes
2017-01-08 13:30:19 +01:00
NathanAdhitya
d6a10e1528 Minor Fixes
Derp. Changed the Minecraft Color Code, and added PlayerInventory
update, as suggested by TheBusyBiscuit.
2017-01-08 18:49:55 +07:00
TheBusyBiscuit
6e1c895d56 Merge pull request #92 from NathanAdhitya/master
Off-Hand Monster Jerky Fix
2017-01-08 11:35:05 +01:00
NathanAdhitya
3a79063a71 Off-Hand Monster Jerky Fix
There may be a better way of implementing this, but.... ehh.. this is my
concept :P.

The other lines, are just naughty github not accepting the Color code
symbols.
2017-01-08 08:44:48 +07:00
TheBusyBiscuit
f639c36509 Fixed Ancient Altar dropping invalid ItemStacks when aborting 2017-01-05 13:53:11 +01:00
TheBusyBiscuit
18def9d050 Machine Settings Pre-Setup 2017-01-04 17:48:44 +01:00
NathanAdhitya
7b86df37fc . 2017-01-01 21:07:26 +07:00
NathanAdhitya
a3afb14a10 . 2017-01-01 20:26:50 +07:00
NathanAdhitya
1af833bf96 Tier 2 Electric Ore Grinder Speed and Energy is not at the proper value. 2017-01-01 20:23:53 +07:00
NathanAdhitya
8ff8daf4b5 Tier 2017-01-01 20:08:40 +07:00
Admin
042ce48272 Added NotPlaceable Interface 2016-12-30 10:48:58 +01:00
TheBusyBiscuit
5b990aa4c5 Added NotPlaceable Interface 2016-12-30 10:48:27 +01:00
AlexLander123
c565252072 Implemention of ExcludedTool and ExcludedSoulboundTool
Fix Soulbound Shovel and Soulbound Hoe Duplication Bug;
2016-12-30 10:09:08 +08:00
mrCookieSlime
f102f452fb Fixed AncientAltar Recipe Check 2016-12-28 08:47:36 +01:00
mrCookieSlime
75c2fea04a Fixed Offhand Juice Handling 2016-12-27 14:24:49 +01:00
mrCookieSlime
ee88262243 Fixed JSON Parsing 2016-12-27 12:44:23 +01:00