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

506 Commits

Author SHA1 Message Date
SoSeDiK
f328300941
Food Fix For Creative Mode 2018-04-10 01:57:35 +03:00
SoSeDiK
9b64804461
Update SlimefunSetup.java 2018-04-10 01:53:16 +03:00
SoSeDiK
5267cdb82b
Fixed mistake 2018-04-10 01:52:24 +03:00
SoSeDiK
410a901bfd
Fixed mistake 2018-04-10 01:51:06 +03:00
TheBusyBiscuit
7b07bc8c61
Merge pull request #630 from meiamsome/network-caching
Create a Network class to manage networks in a stateful way
2018-03-25 10:19:07 +02:00
TheBusyBiscuit
3d90994d9f
Merge pull request #632 from meiamsome/fix-509
Check if the chunk is loaded instead of relying on exceptions
2018-03-25 10:11:50 +02:00
Oliver Wright
eaa93df83e
Move Block storage to be based on Locations. 2018-03-10 19:22:12 +00:00
Oliver Wright
f30c61fcfc
Check if the chunk is loaded instead of relying on exceptions 2018-03-10 19:08:18 +00:00
Oliver Wright
d21f93239b
AReactor fix & a fix for chargable energy sources 2018-03-10 15:32:16 +00:00
Oliver Wright
2c0dc15e4c
Create a Network class to manage networks in a stateful way 2018-03-10 01:05:15 +00:00
Oliver Wright
5aef1c1a25
Prevent Talisman of the Hunter from duping armour/heads 2018-03-05 19:15:38 +00:00
TheBusyBiscuit
b3e5e45b2c
Merge pull request #623 from AtomicScience/master
Fixed incompatibility with KeepItems-like plugins
2018-03-03 17:42:43 +01:00
AtomicScience
fb07f1bb32
Fixed incompatibility with KeepInventory 2018-03-03 18:47:54 +03:00
TheBusyBiscuit
ef51932e31
Merge pull request #619 from meiamsome/electric-dust-washer
Fix #617: Electric Dust Washer - Dust Choice.
2018-03-02 22:51:36 +01:00
TheBusyBiscuit
25539be913
Merge pull request #620 from meiamsome/error-file-creation-fix
Simplify error file name generation
2018-03-02 22:45:10 +01:00
Oliver Wright
7278f80c6f
Fix #617: Electric Dust Washer - Dust Choice. 2018-03-02 20:17:44 +00:00
Oliver Wright
273499a230
Simplify error file name generation 2018-03-02 20:03:11 +00:00
Oliver Wright
63e5245b2c
Simplify the RitualAnimation 2018-03-02 19:40:45 +00:00
VoidAngel
1e5d7e0d2d
Fix discrepancies between block storage data and server events
1) Stop falling blocks from falling into a spot where an SF machine was just mined. Typically the blockstorage does not update fast enough, causing machine duplication. The event is cancelled, and the falling entities drop as items instead of disappearing.

2) Nearly the same as above, but with pistons pushing solid blocks into air blocks which had a slimefun machine in it a moment prior. Typically the blockstorage does not update fast enough, causing machine duplication.
2018-02-21 09:50:59 -08:00
TheBusyBiscuit
c33c8e065e
Merge pull request #597 from Meta-Win/master
Fix #575
2018-02-20 23:47:06 +01:00
VoidAngel
2bec58d361
Fix for #532 - Limited disenchanter dupe glitch 2018-02-20 14:14:56 -08:00
Meta-Win
948c6a650b
Fix Conflict Names 2018-02-15 14:25:55 -02:00
Meta-Win
79cd64361a
Fix Conflict Names 2018-02-15 14:25:14 -02:00
Meta-Win
e7e195a43e
Fix Conflict Names 2018-02-15 14:24:27 -02:00
Dylan Xaldin
16899eb96a Fix Reinforced Spawners being a Pig Spawner when placed. 2018-02-07 19:06:06 -06:00
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
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
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
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
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
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
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
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
4f0aeed504
Merge pull request #544 from Poslovitch/settings-panel
Improved Settings & Contributors panels
2017-12-21 15:06:27 +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
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
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
Meta-Win
c3d3685420
Fix Christmas Cookie and Chocolate Milk Recipes 2017-12-02 17:39:34 -02:00
Florian CUNY
475eaae0b0 Fixed typo "Slimfun" to "Slimefun" 2017-12-01 19:28:12 +01:00
Florian CUNY
5fba0e37ac Fixes #510 2017-12-01 19:27:50 +01:00
TheBusyBiscuit
7e2fc76b12
Merge pull request #513 from Poslovitch/fix-333
Fixes juices not restoring hunger - #333 & #87
2017-12-01 18:00:40 +01:00
Florian CUNY
1763cc61f4
Fixed mishandled check 2017-12-01 17:46:22 +01:00
Florian CUNY
fc20062cd6 Fixed to check version is NOT 1.9 or 1.10 2017-12-01 13:11:05 +01:00
Florian CUNY
8ffb6ffd61 Changed the version check to 1.9 and 1.10 for easier future support 2017-12-01 10:08:31 +01:00
Florian CUNY
35b65139ce Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/333 and https://github.com/TheBusyBiscuit/Slimefun4/issues/87 2017-11-29 21:01:31 +01:00
TheBusyBiscuit
33f27d96c7
Merge pull request #504 from Poslovitch/patch-1
Fixed Android being able to break command blocks
2017-11-26 23:22:49 +01:00
TheBusyBiscuit
595ef5f907
Merge pull request #507 from Poslovitch/4.1.12
4.1.12
2017-11-26 09:51:07 +01:00
TheBusyBiscuit
fe4ec68a35
Merge pull request #502 from Poslovitch/slimefunitem-improvements
SlimefunItem : renames of some methods, made ghost configurable, changed "name" to "id" and privatized all fields
2017-11-26 09:50:41 +01:00
Florian CUNY
e2533d9b75 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/375 2017-11-25 22:07:00 +01:00
Florian CUNY
2696f5a8a5 Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/334 2017-11-25 22:05:34 +01:00
TheBusyBiscuit
3bbd0e040c
Merge pull request #500 from Redemption198/master
Fixed ancient pedestal bug #499
2017-11-25 17:34:01 +01:00
TheBusyBiscuit
fc5be2778d
Merge pull request #503 from AtomicScience/ore_washer_fix
Ore washer dupe fix
2017-11-25 17:33:18 +01:00
Redemption
229dca3766
Added parameters to EventHandler 2017-11-25 13:31:13 +01:00
Florian CUNY
fd4d678332
Use brackets in loops 2017-11-25 10:31:09 +01:00