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,475 Commits 1 Branch 0 Tags 64 MiB
75d568c2dd
Commit Graph

1167 Commits

Author SHA1 Message Date
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
31f82b899f move id to SlimefunItemStack 2019-10-04 00:45:51 +01:00
Daniel Walsh
db0ed1a46b I want a cookie! 2019-10-04 00:31:47 +01:00
Daniel Walsh
3255269e2b Small fix 2019-10-04 00:29:46 +01:00
TheBusyBiscuit
4a2ca7599b Further updates 2019-10-04 01:25:19 +02:00
TheBusyBiscuit
49f1247b13 Removed unused Heavy Armor 2019-10-04 01:21:30 +02: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
01971edbc6
Merge pull request #1 from J3fftw1/J3fftw1-patch-1 
Update TeleportationSequence.java
 2019-10-03 23:01:04 +02:00
J3fftw1
69bcd30399
Merge pull request #2 from J3fftw1/J3fftw1-patch-2 
Update ArmorListener.java
 2019-10-03 23:00:50 +02:00
J3fftw1
b1a94fe5ec
Merge pull request #3 from J3fftw1/J3fftw1-patch-3 
Update RitualAnimation.java
 2019-10-03 23:00:43 +02:00
J3fftw1
445312e31f
Update MagnetTask.java 2019-10-03 22:57:41 +02:00
J3fftw1
7c8dfac1b4
Update RitualAnimation.java 2019-10-03 22:54:11 +02:00
J3fftw1
a30650d16d
Update ArmorListener.java 2019-10-03 22:51:36 +02:00
J3fftw1
55efcc454c
Update TeleportationSequence.java 2019-10-03 22:46:18 +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
695ed72f0c Changed Ignition Chamber Recipe 2019-10-01 18:47:48 +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
ff85e4d894
Merge pull request #1138 from WalshyDev/feature/guide-search 
Guide Search!
 2019-10-01 02:58:56 +02:00
TheBusyBiscuit
7cac093419 Updated CS-CoreLib2 and refactored commands 2019-10-01 02:57:58 +02:00
Daniel Walsh
00ef4d59e8 I hate life 2019-09-30 19:36:08 +01:00
Daniel Walsh
0743d05311 Localization 2019-09-30 19:33:44 +01:00
Daniel Walsh
b0b55f13ad Oops, unused import 2019-09-30 18:14:54 +01:00
Daniel Walsh
570319b5ae Switch to MenuHelper.awaitChatInput 2019-09-30 18:06:50 +01:00
TheBusyBiscuit
3d8d9ed624
Merge pull request #1139 from SoSeDiK/npe 
Fix two NPEs when loading without CS-CoreLib
 2019-09-30 18:40:57 +02:00
SoSeDiK
abf00e038b Use tabs everywhere 2019-09-30 19:33:35 +03:00
SoSeDiK
c56225d051 Fix NPE on disabling without CS-CoreLib 2019-09-30 19:21:33 +03:00
SoSeDiK
f45c40e103 Fix NPE on loading without CS-CoreLib 2019-09-30 19:20:08 +03:00
TheBusyBiscuit
4bb9abd247 Fixed stable-builds Updater 2019-09-30 00:04:43 +02:00
Daniel Walsh
631403ae4e
Add notice for stable 
Some people disable auto-updates on dev builds because they can have issues. Let's instead advertise the stable branch
 2019-09-29 22:57:15 +01:00
WalshyDev
52f078a025 Finish search 2019-09-28 16:13:23 +01:00
WalshyDev
fd4f92326d Cleanup 2019-09-27 20:40:51 +01:00
TheBusyBiscuit
0a540aa16a Removed the Saw Mill from Slimefun 2019-09-27 21:11:26 +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
3a4a1ac96e
Merge pull request #1127 from TheBusyBiscuit/geo 
GEO Miner
 2019-09-26 15:36:36 +02:00
TheBusyBiscuit
526a209fa3 Update 2019-09-26 15:32:20 +02:00
TheBusyBiscuit
4f38890dc3 Added GEO Miner Research 2019-09-26 15:25:42 +02:00
TheBusyBiscuit
2b89c41e3e Updated GEO Scanner 2019-09-26 15:23:27 +02:00
TheBusyBiscuit
965cdc8165 Adjusted ore spawn-rates 2019-09-26 15:22:42 +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
65962d3689 Added more bStats Charts 2019-09-26 12:58:35 +02:00
TheBusyBiscuit
5a591e4f7e Tweaked Auto-Updater 2019-09-26 08:21:49 +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
1af7c8cbf0 Fixes #1116 2019-09-21 13:04:36 +02:00
ajan-12
e6a6d2838f
Fixed a little typo. 2019-09-19 08:54:23 +03: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
WalshyDev
b70d4fc258 Fix hasUnlocked usages 2019-09-10 16:28:08 +01:00
WalshyDev
181165300e Replace item checks with ID checks 2019-09-10 16:10:26 +01:00
WalshyDev
b7714efbac Fix #1104 
Also improves performance and formatting
 2019-09-10 15:25:47 +01:00
TheBusyBiscuit
4662144309 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-09-09 20:59:07 +02:00
TheBusyBiscuit
256428489b Increased technical debt via deprecation :P 2019-09-09 20:58:46 +02: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
LinoxGH
a00d2c9f59
Hopefully fizes #1098 in a better way. 2019-09-08 17:20:12 +03:00
Alex Mercer
ead25ceaac Changed it again 2019-09-08 06:22:15 -07:00
Alex Mercer
22fcb992fd Changed the way it works 2019-09-08 06:04:50 -07:00
Alex Mercer
7c50faf140 Changed item-permission to be per item rather than one global list 2019-09-08 03:47:09 -07:00
ajan-12
643cfadaf4 Fixes #1098. 2019-09-08 10:12:45 +03:00
ajan-12
23819a1d83 Fixes #1085 for real. 2019-09-07 00:15:17 +03:00
ajan-12
5c9ba0a94f Hopefully fixes #1085 2019-09-06 23:57:47 +03:00
TheBusyBiscuit
bc7d92468c Fixes #1096 2019-09-06 17:35:24 +02:00
TheBusyBiscuit
8fd19dd134 Minor Tweaks and Changes 2019-09-06 13:01:45 +02:00
TheBusyBiscuit
eea131878e
Merge pull request #1094 from xH3LLRAIZ3Rx/master 
Changed Slimefun Guide sound to Page Turn
 2019-09-06 12:25:04 +02:00
Alex Mercer
1eebe69dae Changed pitch 2019-09-06 03:11:37 -07:00
TheBusyBiscuit
c7040d09be Reduced technical debt + Fixes #1095 2019-09-06 10:34:17 +02:00
Alex Mercer
41caa1b623 Merge remote-tracking branch 'origin/master' 2019-09-05 22:25:50 -07:00
Alex Mercer
d2defd9a89 Changed volume 2019-09-05 22:25:36 -07:00
Alex Mercer
6341c19906
Merge branch 'master' into master 2019-09-05 22:06:03 -07:00
Alex Mercer
c1c0c99bc8 Changed Slimefun Guide sound to Page Turn 2019-09-05 22:05:06 -07:00