mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
1,384 Commits 1 Branch 0 Tags 64 MiB
3d8d9ed624
Commit Graph

1384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
33073a4100
Merge pull request #877 from SoSeDiK/lambda 
Use lambda expressions
 2019-04-07 11:44:42 +02:00
TheBusyBiscuit
0c96f69346
Merge pull request #882 from SoSeDiK/temp 
Temporary fix for #881
 2019-04-07 11:44:06 +02:00
TheBusyBiscuit
a736484e55
Merge pull request #884 from bverhoeven/null-item-fix 
Prevent Slimefun blocks from getting corrupted at startup
 2019-04-07 11:38:59 +02:00
Bas Verhoeven
0d45fee741 Do not overwrite block for a location that already has a valid block 
This shouldn't happen, but if it does happen it'll definitely break the block.
We'll notify the server administrator on load and only keep the first block we
see.

Note that this will only happen if there's something seriously wrong with the
block as generally there'll not be a situation where information is stored in
two different files.
 2019-04-07 03:02:09 +02:00
Bas Verhoeven
1d7c1e68c8 Do not load incomplete blocks (missing "id") 
If incomplete blocks are loaded, without an "id", items will not have
any usable slimefun block information and will not be usable. Breaking
these blocks will give you a "CSCoreLib's Head".
 2019-04-07 03:01:53 +02:00
SoSeDiK
fb50e6c59a Update SlimefunItems.java 2019-04-03 16:37:39 +03:00
SoSeDiK
385edf3cd7 Even more lambdas expressions 2019-03-31 21:32:40 +03:00
SoSeDiK
77654eb23c Merge remote-tracking branch 'upstream/master' into lambda 2019-03-31 11:46:17 +03:00
TheBusyBiscuit
530189ecac
Merge pull request #876 from SoSeDiK/items 
Update SlimefunItems.java
 2019-03-31 09:41:57 +02:00
TheBusyBiscuit
05f8c59f9d
Merge pull request #875 from SoSeDiK/tasks 
Optimize tasks running
 2019-03-31 09:41:06 +02:00
SoSeDiK
3c4e8e6b32 Use lambda expressions 2019-03-30 14:32:13 +02:00
SoSeDiK
2cc3c5c4d3 Update SlimefunItems.java 2019-03-30 14:11:51 +02:00
SoSeDiK
3e2f903425 Optimize tasks running 2019-03-30 14:06:44 +02:00
TheBusyBiscuit
009dede7cf
Merge pull request #872 from SoSeDiK/food 
Rename ORGANIC_FOOD and FERTILIZER
 2019-03-30 12:29:34 +01:00
TheBusyBiscuit
b44cce7a5e
Merge pull request #874 from SoSeDiK/AEA 
Prevent "Asynchronous entity add!"
 2019-03-30 11:29:26 +01:00
TheBusyBiscuit
8efef16186
Merge pull request #873 from SoSeDiK/events 
Implement listeners for some events
 2019-03-30 11:28:04 +01:00
SoSeDiK
4a4934de68 Prevent "Asynchronous entity add!" 2019-03-30 12:15:56 +02:00
SoSeDiK
0361dfb6a0 Implement listeners for some events 2019-03-30 12:10:54 +02:00
SoSeDiK
0794fe8a2c Rename ORGANIC_FOOD and FERTILIZER 2019-03-30 11:59:52 +02:00
TheBusyBiscuit
358a73f73b
Merge pull request #871 from bverhoeven/master 
Fix Soulbound Axe duplication bug
 2019-03-29 22:58:04 +01:00
Bas Verhoeven
6cbc0a9f92 Fix Soulbound Axe duplication bug 
Similiar to 2ae249dec4

Fixes issue #870
 2019-03-29 22:45:15 +01:00
TheBusyBiscuit
6213c62f47
Merge pull request #866 from SoSeDiK/deprecations 
Replaced deprecated code
 2019-03-29 22:32:50 +01:00
TheBusyBiscuit
7eb074daaa
Merge pull request #869 from SoSeDiK/startup 
Implement createDir() method
 2019-03-27 23:33:37 +01:00
SoSeDiK
56a3941f2f Updated method 2019-03-28 00:31:32 +02:00
TheBusyBiscuit
00b99072e7
Merge pull request #868 from SoSeDiK/guide 
Don't reset guide history when using cheat mode
 2019-03-27 23:25:32 +01:00
TheBusyBiscuit
0b444abe75
Merge pull request #867 from SoSeDiK/potions 
Use ExoticGarden format for drinks
 2019-03-27 23:23:34 +01:00
SoSeDiK
8a1cb8dad9 Replace deprecated code 2019-03-27 22:48:34 +02:00
SoSeDiK
2c62cae68e Implemented createDir() method 2019-03-27 22:46:04 +02:00
SoSeDiK
4e7f6bfa47 Replace deprecated code 2019-03-27 22:41:29 +02:00
SoSeDiK
eeb51fde41 Don't reset guide history when using cheat mode 2019-03-27 22:38:53 +02:00
SoSeDiK
81e18514ef Use ExoticGarden format for drinks 2019-03-27 22:31:48 +02:00
TheBusyBiscuit
7a0a98bb6d
Merge pull request #863 from SoSeDiK/furnace 
Update FurnaceListener.java
 2019-03-27 21:21:00 +01:00
SoSeDiK
75cbff530c Replaced spaces with tabs 2019-03-27 22:18:59 +02:00
SoSeDiK
c8965e120f Replaced deprecated code parts 2019-03-27 22:10:19 +02:00
SoSeDiK
9e9e36e5c2 Replaced Durability with Damageable meta 2019-03-27 22:09:04 +02:00
TheBusyBiscuit
4fad8aa82c
Merge pull request #864 from SoSeDiK/sneaking 
Prevent opening inventory while sneaking with an item
 2019-03-27 21:08:52 +01:00
TheBusyBiscuit
b7f3d025a7
Merge pull request #865 from SoSeDiK/researching 
Optimized researching progress
 2019-03-27 21:07:05 +01:00
SoSeDiK
3c385770e1 Optimized researching progress 2019-03-27 21:38:30 +02:00
SoSeDiK
80642eeed1 Replaced deprecated enchantments code 2019-03-27 21:34:20 +02:00
SoSeDiK
76d00f9a34 Optimized error logging 2019-03-27 21:31:51 +02:00
SoSeDiK
bb35ab3d82 Remove juice one tick faster 2019-03-27 21:07:33 +02:00
SoSeDiK
5915e0dff4 Prevent opening inventory while sneaking with an item 
Vanilla behaviour.
 2019-03-27 21:07:13 +02:00
SoSeDiK
fbf01b1c39 Update FurnaceListener.java 2019-03-27 20:58:47 +02:00
SoSeDiK
2337004c17 Update FurnaceListener.java 2019-03-27 20:51:23 +02:00
SoSeDiK
da16fee28b Update FurnaceListener.java 2019-03-27 20:45:45 +02:00
SoSeDiK
38bcb6b731 Update FurnaceListener.java 2019-03-27 20:25:50 +02:00
TheBusyBiscuit
02ee0f1ce4
Merge pull request #859 from SoSeDiK/androids 
Androids
 2019-03-27 16:55:28 +01:00
TheBusyBiscuit
8c2746e775
Merge pull request #860 from SoSeDiK/spawners 
Spawners
 2019-03-27 16:40:44 +01:00
TheBusyBiscuit
3d3d6ab554
Merge pull request #858 from SoSeDiK/cp 
Updated CoreProtect API
 2019-03-27 16:37:13 +01:00
TheBusyBiscuit
8b2f286ee4
Merge pull request #857 from SoSeDiK/we 
Updated WorldEdit API
 2019-03-27 16:33:16 +01:00