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

950 Commits

Author SHA1 Message Date
SoSeDiK
b423c9bd87
Replaced deprecated method 2018-04-16 19:46:18 +03:00
SoSeDiK
111424bae4
Replaced deprecated method 2018-04-16 19:45:09 +03:00
SoSeDiK
eb7388c613
Replaced deprecated method 2018-04-16 19:43:03 +03:00
SoSeDiK
2f7d4b619b
Replaced deprecated method 2018-04-16 19:41:50 +03:00
SoSeDiK
41b6cd389d
Added holidays prefixes 2018-04-16 19:11:50 +03:00
SoSeDiK
44e696c19c
Added holidays prefixes 2018-04-15 19:55:18 +03:00
SoSeDiK
5a3978691f
Added holidays prefixes 2018-04-15 19:53:11 +03:00
SoSeDiK
1482218f84
Added holidays prefixes 2018-04-15 19:29:03 +03:00
SoSeDiK
86429da311
Oops... Forgot about the import. 2018-04-15 19:23:23 +03:00
SoSeDiK
eabd074f05
Fixed & in title messages 2018-04-15 19:18:43 +03:00
SoSeDiK
42ae9103e5
Replace deprecated method 2018-04-10 02:12:25 +03:00
SoSeDiK
9f2d91a20c
Allow using different log types 2018-04-10 02:04:43 +03:00
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
TheBusyBiscuit
2f2cf7300f
Merge pull request #629 from meiamsome/nuclear-reactor-fix
Fix AReactor Issue
2018-03-25 10:09:33 +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
TheBusyBiscuit
195ebe7735 Updated to Version: 4.1.14 2018-03-05 21:25:16 +01:00
TheBusyBiscuit
313d71c2cd
Merge pull request #627 from meiamsome/hunter_talisman_fix
Prevent Talisman of the Hunter from duping armour/heads
2018-03-05 21:21:41 +01: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
TheBusyBiscuit
fd8967e773
Merge pull request #618 from meiamsome/altar-animation-cleanup
Simplify the RitualAnimation
2018-03-02 22:42:44 +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
TheBusyBiscuit
9e0262d8b5
Merge pull request #610 from VoidAngel/patch-1
Fix discrepancies between block storage data and server events
2018-02-25 09:15:12 +01: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
TheBusyBiscuit
b69e80dfaa
Merge pull request #608 from VoidAngel/patch-1
Fix for #532 - Limited disenchanter dupe glitch
2018-02-20 23:34:13 +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
TheBusyBiscuit
018e8b955b
Merge pull request #591 from Puremin0rez/master
Fix Reinforced Spawners being a Pig Spawner when placed.
2018-02-11 12:18:28 +01: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
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