1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

369 Commits

Author SHA1 Message Date
TheBusyBiscuit
561445768d
Merge pull request #1152 from WalshyDev/performance-improvements
Some performance improvements
2019-10-04 14:01:24 +02:00
TheBusyBiscuit
2c9445a971
Merge pull request #1149 from J3fftw1/master
Changed values of sound decaying
2019-10-04 14:01:18 +02:00
J3fftw1
27521167a8
Update InfusedHopper.java 2019-10-04 13:02:06 +02:00
Daniel Walsh
5ac4920756 Some performance improvements 2019-10-04 11:14:27 +01:00
TheBusyBiscuit
804bea553b Added Sweet Berry Juice 2019-10-04 03:11:40 +02:00
TheBusyBiscuit
d0329b185d Massive performance improvements for Items created after this build 2019-10-04 02:39:38 +02:00
TheBusyBiscuit
14cf3fee37 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
Conflicts:
	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
2019-10-04 02:21:38 +02:00
Daniel Walsh
581c2fc65d Changes 2019-10-04 01:14:09 +01:00
TheBusyBiscuit
4a339c6f80 Updated even more staff 2019-10-04 01:57:10 +02:00
Daniel Walsh
3255269e2b Small fix 2019-10-04 00:29:46 +01:00
Daniel Walsh
160f471445 Implement persistent data to getByItem and isItem 2019-10-04 00:20:36 +01:00
TheBusyBiscuit
4882a97ff5 Updated some outdated stuff 2019-10-04 01:02:51 +02:00
Daniel Walsh
9ba54a79cf Implement persistent ID 2019-10-03 23:37:13 +01:00
Daniel Walsh
2d8cb7c30b Some constructor cleanup 2019-10-03 22:58:48 +01:00
J3fftw1
9aab707291
Update MagnetTask.java 2019-10-03 23:08:41 +02:00
J3fftw1
445312e31f
Update MagnetTask.java 2019-10-03 22:57:41 +02:00
TheBusyBiscuit
f818668ba0 You can no longer cheat in Multiblocks (+ Code cleanup) 2019-10-03 18:06:14 +02:00
TheBusyBiscuit
fdb0d011ef Reworked some internal stuff 2019-10-02 13:54:59 +02:00
TheBusyBiscuit
74ee019603 Smeltery now shows all its "1 component"-Recipes in the Guide 2019-10-01 18:48:13 +02:00
TheBusyBiscuit
db0b6dfa90 Fixed Stone Chunk -> Cobblestone Recipe not working 2019-10-01 18:47:40 +02:00
TheBusyBiscuit
431892abb2 Updated some deprecated methods 2019-10-01 17:04:09 +02:00
TheBusyBiscuit
21582610ad Updated to CS-CoreLib2 v0.5.6 2019-10-01 13:14:50 +02:00
TheBusyBiscuit
7cac093419 Updated CS-CoreLib2 and refactored commands 2019-10-01 02:57:58 +02:00
TheBusyBiscuit
cff45aae66 Updated CS-CoreLib2 dependency 2019-09-27 21:08:57 +02:00
TheBusyBiscuit
c4a5705c44
Fixes #1130 2019-09-27 20:28:49 +02:00
TheBusyBiscuit
48aabe752d
Fixes #1129 2019-09-27 09:02:17 +02:00
TheBusyBiscuit
c82f61a58d
Merge branch 'master' into constructor_cleanup 2019-09-26 20:54:01 +02:00
TheBusyBiscuit
229b0f8e87 Fixed double-registration of basic machine recipes 2019-09-26 20:32:59 +02:00
TheBusyBiscuit
dd5965eeac Reduced technical debt 2019-09-26 20:22:28 +02:00
TheBusyBiscuit
fd76555ea1 Fixed Basic Machines not showing all recipes 2019-09-26 20:09:03 +02:00
Liruxo
b7ec184364 Added Deprecated Compatibility Constructors 2019-09-26 18:42:47 +02:00
Liruxo
2e340be7ff Multiblock constructor refactor 2019-09-26 18:07:58 +02:00
TheBusyBiscuit
3ed959ed1c Updated GEO-Miner 2019-09-26 15:15:33 +02:00
TheBusyBiscuit
016b1c84eb Added GEO Miner 2019-09-26 15:09:19 +02:00
TheBusyBiscuit
cc29dd6333 Refactoring 2019-09-26 13:53:36 +02:00
TheBusyBiscuit
98b6607db6 Updated Miner Hologram 2019-09-25 14:19:34 +02:00
TheBusyBiscuit
f4e2c97327 Added GEO-Miner 2019-09-25 14:17:06 +02:00
TheBusyBiscuit
dcee66839f Added Portable GEO-Scanner, Uranium Resources and improved gps 2019-09-23 17:50:35 +02:00
TheBusyBiscuit
28a4205e8c Added pagination to Machine Recipes (Resolves #1005) 2019-09-21 21:40:54 +02:00
TheBusyBiscuit
a31a30b6af Reduced technical debt 2019-09-21 16:21:10 +02:00
TheBusyBiscuit
0f7f31f8ba Reduced technical debt 2019-09-21 14:54:55 +02:00
TheBusyBiscuit
d18409bfc4 Refactored Messages 2019-09-21 13:59:15 +02:00
TheBusyBiscuit
25ee04bb89
Merge pull request #1117 from WalshyDev/fix/fix-storm-staff-usages
Improve storm staff usages
2019-09-11 12:21:38 +02:00
TheBusyBiscuit
580931d729 Updated to CS-CoreLib 2 v0.5.1 2019-09-11 11:53:05 +02:00
WalshyDev
0219de80b2 remove unused import 2019-09-10 22:37:40 +01:00
WalshyDev
4468c8a382 Fix lore 2019-09-10 21:58:28 +01:00
WalshyDev
d3b13e62f5 Fix storm staff usage bug
Also improve the way it is done, there was no way to go through all possible usages checking the lore on each one...
Downside: It will reset the usage on current items due to it being saved/loaded in a different way
2019-09-10 21:36:34 +01:00
TheBusyBiscuit
d5d15a60ec
Merge pull request #1099 from LinoxGH/master
Fixes #1098.
2019-09-09 12:45:24 +02:00
TheBusyBiscuit
dfc23277a8
Merge pull request #1100 from xH3LLRAIZ3Rx/master
Changed item-permission message to be per item rather than one global list
2019-09-09 12:45:13 +02:00
Alex Mercer
834fddf84d Changed permission-message and other things 2019-09-08 19:10:53 -07:00