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

1732 Commits

Author SHA1 Message Date
Redemption
1b1954d47d
Fixed Android Miner not breaking Slimefun blocks correctly 2018-01-03 16:25:29 +01:00
Redemption
8d14bd3a9f
Merge pull request #1 from TheBusyBiscuit/master
Updated fork
2018-01-03 16:21:44 +01:00
Florian CUNY
a4dd773cb8 Fixed month of Easter category to April 2018-01-01 21:21:46 +01:00
StarWishsama
4d9b141f23
correct word of Files.java 2017-12-31 09:07:02 +08:00
Florian CUNY
2d66ca38cb Renamed experimental variable to book in SlimefunGuide 2017-12-30 01:31:50 +01:00
TheBusyBiscuit
fb4b3ab738
Fixed Arguments 2017-12-29 12:10:21 +01:00
TheBusyBiscuit
f5d9170961
Fixed Import 2017-12-29 12:01:22 +01:00
TheBusyBiscuit
691c8740d5
Merge pull request #549 from Redemption198/master
Fixed Pedestal not dropping item when is broken or explodes
2017-12-29 11:55:59 +01:00
TheBusyBiscuit
f9f4648303
Fixed ChestTerminal Lore 2017-12-29 11:54:23 +01:00
Redemption
2a80104402
Removed useless checks 2017-12-28 23:15:09 +01:00
Redemption
815557c29e
Update SlimefunSetup.java 2017-12-28 11:44:54 +01:00
Redemption
ccbea5a93b
Update config.yml 2017-12-28 11:19:45 +01:00
Redemption
d9f5442351
Reverted 2017-12-28 11:16:14 +01:00
Redemption
349d4f7e90
Fixed pedestal not dropping item when is broken or explodes 2017-12-28 11:11:03 +01:00
Redemption
aa7758467b
Removed option fro dropping item when pedestal explodes. 2017-12-28 11:08:20 +01:00
TheBusyBiscuit
0c76e1978f
Merge pull request #551 from Poslovitch/security
Explicitly disallow registering two SFItems with same ID
2017-12-27 13:55:14 +01:00
Redemption
8efcfba90c
Fixed unpickable item staying after pedestal esplosion
Now if the pedestal explodes the item above it'll be removed, and dropped if requested.
2017-12-26 16:57:07 +01:00
Redemption
2bb1a059ed
Added an option for ancient pedestals
Added the option "drop-item-when-ancient-pedestal-explodes" (Default: false).
2017-12-26 16:52:29 +01:00
Florian CUNY
97bd64474f Wrapped the ID in \" to simplify reading the exception 2017-12-26 15:45:52 +01:00
Florian CUNY
c14aba1e6b Explicitly disallow registering two SFItems with same ID 2017-12-26 15:44:18 +01:00
Redemption
bc314087d1
Reverted to single message 2017-12-26 00:17:57 +01:00
Redemption
f9a6225793
Reverted to single message for obstructed pedestral. 2017-12-26 00:15:29 +01:00
Redemption
12ec120d48
Split pedestal obstructed message.
Now there are two messages for the obstructed pedestal, one for blocks and one for liquids.
2017-12-25 20:45:44 +01:00
Redemption
496473f593
Fixed Pedestal not dropping above item.
Now the pedestal drops the item which is currently above of it when it's broken.
Also when the pedestal is obstructed now it'll warn to remove the block or the fluid which is blocking the pedestal.
2017-12-25 20:43:23 +01:00
TheBusyBiscuit
04bdac8462
Update CONTRIBUTING.md 2017-12-24 10:03:22 +01:00
TheBusyBiscuit
4f0aeed504
Merge pull request #544 from Poslovitch/settings-panel
Improved Settings & Contributors panels
2017-12-21 15:06:27 +01:00
TheBusyBiscuit
03924d2a0a
Merge pull request #545 from Poslovitch/master
Small performance improvement in CargoManager
2017-12-21 15:04:12 +01:00
Florian CUNY
2d38231101 Small performance improvement in CargoManager
done by saving the blockinfo to avoid heavy calls. Would probably need later a more reliable "rewrite".

Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/514
2017-12-21 08:22:57 +01:00
TheBusyBiscuit
5c6b8bd838
Merge pull request #541 from Meta-Win/master
Changed getName to getID and some deprecation fix
2017-12-20 21:09:43 +01:00
Meta-Win
d6a67e3908
Reverted 2017-12-20 17:16:34 -02:00
Meta-Win
c9e04851f9
Add files via upload 2017-12-20 00:45:17 -02:00
Meta-Win
dbe900b39b
Add files via upload 2017-12-20 00:44:53 -02:00
Meta-Win
a257efa98f
Add files via upload 2017-12-20 00:44:22 -02:00
Meta-Win
aeaa912bf2
Add files via upload 2017-12-20 00:43:51 -02:00
Meta-Win
71a0aa8544
Add files via upload 2017-12-20 00:43:15 -02:00
TheBusyBiscuit
f9e7c3cae6
Merge pull request #529 from Poslovitch/smelters-fix
Fix NPE on BlockBreakEvent with Smelter's Pickaxe
2017-12-17 20:02:27 +01:00
TheBusyBiscuit
def05c3d2f
Update README.md 2017-12-17 19:24:49 +01:00
Florian CUNY
be4d91c7ea Added Stars count in Settings panel 2017-12-09 17:04:37 +01:00
Florian CUNY
665521aecb Improved Credits display
- If the contributer's name is the same than in Minecraft, his head shows up ( 🎆 )
- Contribution is now shown in a more understandable way
2017-12-09 16:52:13 +01:00
Florian CUNY
d2b4d58e35 Documented and made changes to Contributor 2017-12-09 16:28:45 +01:00
Florian CUNY
cd741d19d5 Fix NPE on BlockBreakEvent with Smelter's Pickaxe
as well as optimizing it a bit.

Fixes #367
2017-12-09 15:54:22 +01:00
Florian CUNY
36ddfbf65f Simplified the pass condition in Talisman 2017-12-09 15:53:44 +01:00
Florian CUNY
6cb081cfd3 Minor changes in Talisman and EnderTalisman
Renamed consumed field to consumable
Added javadoc : since

Talisman -
Field initialisation inline instead of in constructors
Simplified a condition
2017-12-09 15:46:50 +01:00
Florian CUNY
858f964b82 Privatized fields in Talisman and EnderTalisman 2017-12-09 15:38:14 +01:00
Florian CUNY
5fb3ec967b Fixed typo in SlimefunSetup 2017-12-09 15:37:53 +01:00
Florian CUNY
9760fc75b1 Moved Miner Talisman listener from ToolListener to TalismanListener 2017-12-09 15:34:36 +01:00
Florian CUNY
24a5613c05 Fixed wrong "since" in ItemPickupListeners' documentation 2017-12-09 15:34:06 +01:00
TheBusyBiscuit
a93a5e88d6
Fixed Christmas Cake Recipe 2017-12-02 21:38:16 +01:00
TheBusyBiscuit
289291b0ef
Merge pull request #522 from Meta-Win/patch-1
Fix Christmas Cookie and Chocolate Milk Recipes
2017-12-02 21:36:57 +01:00
Meta-Win
c3d3685420
Fix Christmas Cookie and Chocolate Milk Recipes 2017-12-02 17:39:34 -02:00