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

756 Commits

Author SHA1 Message Date
TheBusyBiscuit
7fefb0ea15
Merge pull request #573 from AtomicScience/master
Fixed Cooler rejecting Juices
2018-01-10 12:30:58 +01:00
AtomicScience
5c688177f8
Some tiny changes in onClick() 2018-01-08 22:33:47 +03:00
TheBusyBiscuit
aadbfaef47
Added Badge 2018-01-08 19:43:19 +01:00
TheBusyBiscuit
0a6f54ec8d
Merge pull request #569 from Poslovitch/documentation
Documentation fixes and improvements
2018-01-07 20:48:12 +01:00
TheBusyBiscuit
1d0660db53
Merge pull request #570 from Redemption198/master
Fixed Android Miner not breaking Slimefun blocks correctly
2018-01-07 20:29:14 +01:00
AtomicScience
44e8b103f9
Fixed Cooler rejecting juices 2018-01-07 17:33:57 +03:00
Redemption
24e070b7a8
Moved BlockStorage.check() inside the methods 2018-01-07 12:52:28 +01:00
Redemption
7b9687f79d
Added blockhandler check before breaking sf blocks 2018-01-07 01:26:38 +01:00
Redemption
17cc989012
Documented #retrieve()
Credits: @Poslovitch
2018-01-06 16:13:16 +01:00
Redemption
9f0796327b
Fixed Android Miner not breaking Slimefun blocks correctly 2018-01-06 15:53:23 +01:00
Florian CUNY
16af68b289 Simplified CategorySorter#compare() 2018-01-06 15:28:02 +01:00
Florian CUNY
f2a74bb46c Improved documentation in Category and Alloy 2018-01-06 15:26:01 +01:00
Florian CUNY
7851f33b57 Fixed @since tags for 4f0aeed504 2018-01-06 15:03:28 +01:00
TheBusyBiscuit
a4ac8962ca Updated to Version: 4.1.13 2018-01-06 13:55:11 +01:00
TheBusyBiscuit
bb22ceab5b
Merge pull request #567 from John000708/master
Fixed speed modifier not getting applied to Enhanced Furnaces
2018-01-06 12:54:31 +01:00
TheBusyBiscuit
9a948b705a
Merge pull request #560 from Poslovitch/preparing-new-guide-layout
Preparing new guide layout
2018-01-06 12:53:07 +01:00
John000708
3e232c00d8 Tiny typo fixed 2018-01-06 12:51:16 +01:00
TheBusyBiscuit
4f9c36c8a2
Merge pull request #557 from StarWishsama/master
correct word in Files.java
2018-01-06 12:49:49 +01:00
TheBusyBiscuit
7a26255f20
Test :> 2018-01-06 12:42:47 +01:00
TheBusyBiscuit
2782fa6064
Fixed config.yml being empty 2018-01-06 11:31:49 +01:00
John000708
2777ec9407 Small fix 2018-01-06 11:07:54 +01:00
John000708
b6c3021355 Fixed speed modifier not getting applied to Enhanced Furnaces 2018-01-05 18:09:10 +01:00
Redemption
fefd3b1fe5
Removed debug prints 2018-01-03 16:36:40 +01:00
Redemption
ffc9de3f7c
Added ANDROID_DIG as Unregister Reason 2018-01-03 16:26:43 +01:00
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