1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

1416 Commits

Author SHA1 Message Date
TheBusyBiscuit
804bea553b Added Sweet Berry Juice 2019-10-04 03:11:40 +02:00
TheBusyBiscuit
5c40e689e9 Significant performance improvement for items crafted after this build 2019-10-04 02:54:46 +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
TheBusyBiscuit
5566f4b42e
[CI Skip] Merge pull request #1150 from WalshyDev/persistent-data
Persistent data on items
2019-10-04 02:16:16 +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
TheBusyBiscuit
f818668ba0 You can no longer cheat in Multiblocks (+ Code cleanup) 2019-10-03 18:06:14 +02:00
TheBusyBiscuit
777e24521a Fixes #1145 2019-10-02 13:55:09 +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
TheBusyBiscuit
200151e590
Merge pull request #1133 from vanishedvan/master
Tweaked the README a bit.
2019-09-30 18:40:40 +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
TheBusyBiscuit
6797d6a01d
Merge pull request #1134 from TheBusyBiscuit/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.5.3
2019-09-30 00:02:25 +02:00
TheBusyBiscuit
708ced4a19
Merge pull request #1137 from WalshyDev/patch-2
Add notice for stable
2019-09-30 00:02:13 +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
Renovate Bot
e902a73345
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.5.3 2019-09-27 21:53:02 +00:00
WalshyDev
fd4f92326d Cleanup 2019-09-27 20:40:51 +01:00
Vanished
fd396c62c9
Update README.md 2019-09-27 21:39:54 +02: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
0f488c1479
Merge pull request #1128 from Liruxo/constructor_cleanup
Multiblock constructor refactor
2019-09-26 20:59:51 +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