Daniel Walsh
b0832702af
Update CS-CoreLib to 1.14 patch
2019-04-29 18:08:05 +01:00
TheBusyBiscuit
15555872c7
Merge pull request #905 from sarhatabaot/patch-1
...
Minor codecleanup & fixed spelling mistake
2019-04-29 18:43:54 +02:00
Omer Oreg
364a7944a6
Minor codecleanup & fixed spelling mistake
...
* Specifying the type in the diamond operator is not necessary in from java 7
* Spelling mistake: convertable -> convertible
* Encapsulated the item & machine variables.
* Changed the constructor as Slimefunitem item is not used anywhere except in the constructor.
2019-04-29 14:12:55 +03:00
WalshyDev
733f401ff6
SF 4.1.17 - MC v1.14
2019-04-28 16:22:30 +01:00
TheBusyBiscuit
bc27ac81b1
Update pom.xml
2019-04-20 13:40:46 +02:00
TheBusyBiscuit
f1512ffeea
Merge pull request #900 from sarhatabaot/patch-1
...
Return efficiency when getFuelEfficiency is called
2019-04-20 10:16:24 +02:00
TheBusyBiscuit
5b0a3f2acf
Merge pull request #898 from jellysnake/master
...
Fix miners not having the correct range
2019-04-20 10:16:16 +02:00
Omer Oreg
08538ad876
Return efficiency when getFuelEfficiency is called
...
Return efficiency when getFuelEfficiency is called instead of speed.
2019-04-19 18:09:55 +03:00
jellysnake
0d65da0dd7
Fix miners not having the correct range
2019-04-19 01:07:35 +10:00
TheBusyBiscuit
4f05f8047d
Merge pull request #891 from SoSeDiK/cargo
...
Fix for #888
2019-04-13 14:25:57 +02:00
SoSeDiK
4fed304381
Fix for #888
2019-04-13 13:47:22 +03:00
TheBusyBiscuit
9436c3d654
Merge pull request #889 from SoSeDiK/SoulJars
...
Fix for SoulJars' spawner recipes not being displayed properly
2019-04-11 15:23:42 +02:00
SoSeDiK
4710fd809e
Fix for SoulJars' spawner recipes not being displayed properly
2019-04-11 16:10:23 +03:00
TheBusyBiscuit
eab826539b
Update README.md
2019-04-10 22:03:21 +02:00
TheBusyBiscuit
e919fe336c
Added Discord
2019-04-10 22:00:22 +02:00
TheBusyBiscuit
506c54149e
Changed Script Rating System
2019-04-10 18:45:14 +02:00
TheBusyBiscuit
090471167c
Merge pull request #886 from SoSeDiK/androids
...
Better Androids
2019-04-10 18:31:38 +02:00
SoSeDiK
3826993be2
Better menu switching for Androids
2019-04-08 14:45:02 +03:00
SoSeDiK
c04b293d62
Fix for #885
2019-04-08 13:53:55 +03:00
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#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
