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,618 Commits 1 Branch 0 Tags 64 MiB
c9b678f1a0
Commit Graph

1618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9db8f718e7 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-09-26 12:58:52 +02:00
TheBusyBiscuit
65962d3689 Added more bStats Charts 2019-09-26 12:58:35 +02:00
TheBusyBiscuit
003e134795
Update README.md 2019-09-26 08:28:37 +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
TheBusyBiscuit
fb78ac418a
Merge pull request #1124 from ajan-12/patch-2 
Fixed a little typo.
 2019-09-20 22:30:48 +02:00
TheBusyBiscuit
f2322071df
Merge pull request #1125 from TheBusyBiscuit/renovate/me.clip-placeholderapi-2.x 
Update dependency me.clip:placeholderapi to v2.10.4
 2019-09-20 22:30:42 +02:00
Renovate Bot
a44b7937d2
Update dependency me.clip:placeholderapi to v2.10.4 2019-09-19 18:36:09 +00: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
TheBusyBiscuit
75a2a9611d
Merge pull request #1113 from WalshyDev/master 
Fix #1104
 2019-09-10 17:34:01 +02: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
TheBusyBiscuit
10038f17d5
Merge pull request #1097 from LinoxGH/master 
Fixes #1085.
 2019-09-06 23:41:28 +02:00