1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

313 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
5a5651ab38
Fixes #1093 2019-09-06 01:50:53 +02:00
TheBusyBiscuit
32e280879e
Merge pull request #1092 from WalshyDev/master
Micro-optimisations
2019-09-06 00:27:58 +02:00
TheBusyBiscuit
e0d12f467a Removed unused imports 2019-09-06 00:27:50 +02:00
TheBusyBiscuit
26750e5cfc Reduced technical debt 2019-09-06 00:17:14 +02:00
TheBusyBiscuit
fd77bb6a00 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-09-06 00:10:50 +02:00
TheBusyBiscuit
96b45868ad Removed unneeded Holograms 2019-09-06 00:10:37 +02:00
WalshyDev
9ff32fb72e Micro-optimisations 2019-09-05 23:09:25 +01:00
TheBusyBiscuit
4fd148418c
Merge pull request #1082 from LinoxGH/master
Adding Soulbound Rune with the requested changes.
2019-09-05 23:46:17 +02:00
TheBusyBiscuit
5015ddc560 Refactored Code 2019-09-05 23:30:16 +02:00
Liruxo
3f0f794863 Review suggestions implemented 2019-09-05 22:31:08 +02:00
Liruxo
4f89c2d6e5 MultiBlockListener overhaul 2019-09-05 21:41:59 +02:00
ajan-12
05bd9337ab Did the requested changes vol.4 2019-09-05 20:35:16 +03:00
ajan-12
f4da4d2423 Did the requested changes vol.3 2019-09-05 17:38:04 +03:00
ajan-12
441291a9c2 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 2019-09-05 17:18:48 +03:00
ajan-12
ebde63a04e Did the requested changes vol.2 2019-09-05 17:16:10 +03:00
LinoxGH
84303891d7
Merge branch 'master' into master 2019-09-05 15:08:19 +03:00
ajan-12
a98517f8cc Did the requested changes. 2019-09-05 15:02:26 +03:00
TheBusyBiscuit
861ddba869 Fixes #1084 2019-09-04 20:55:45 +02:00
TheBusyBiscuit
b4dff80dcc Reduced technical debt 2019-09-04 19:51:03 +02:00
TheBusyBiscuit
f623c5d2ea Reduced technical debt 2019-09-04 19:42:17 +02:00
TheBusyBiscuit
af40186418 Updated dependencies 2019-09-04 09:54:24 +02:00
TheBusyBiscuit
a1a3ee68ef Added Tier 2 Coal and Lava Generators 2019-09-03 20:35:21 +02:00
ajan-12
7501dc9afb Actual commit adding the Soulbound Rune.
- Added Soulbound Rune with a research and recipe.
- Did the requested changes.
  - Moved isSoulbound check from DamageListener.java to SlimefunManager.java.
- Added a new ItemHandler called ItemDropHandler.
2019-09-03 20:30:58 +03:00
ajan-12
2a8c6265b0 Added Soulbound Rune.
- Added Soulbound Rune with a research and recipe.
- Did the requested changes.
  - Moved isSoulbound check from DamageListener.java to SlimefunManager.java.
- Added a new ItemHandler called ItemDropHandler.
2019-09-03 20:25:59 +03:00
TheBusyBiscuit
4651baf13f Code Cleanup 2019-09-03 16:44:59 +02:00
TheBusyBiscuit
9277b120e1 Refactored Code 2019-09-03 16:29:46 +02:00
TheBusyBiscuit
4282bfee5d Reduced technical debt 2019-09-03 13:06:24 +02:00
TheBusyBiscuit
a49877964e Reduced technical debt 2019-09-02 23:14:48 +02:00
TheBusyBiscuit
38c4333d72 Retextured Categories 2019-09-02 13:36:34 +02:00
TheBusyBiscuit
dd14816504 Added Blue Ice to Freezer 2019-09-02 11:25:06 +02:00
TheBusyBiscuit
4d52b034f1 Fixed Explosive Tools 2019-09-02 11:12:42 +02:00
TheBusyBiscuit
b5d9e11bad Added a bunch more machine Recipes to be shown in the guide 2019-09-02 11:12:34 +02:00
TheBusyBiscuit
3368c56c62 Reduced technical debt 2019-09-02 10:24:53 +02:00
TheBusyBiscuit
b075779f6b Fixed Error Reports 2019-09-02 10:05:17 +02:00
TheBusyBiscuit
40f2ef862a Minor performance improvement 2019-09-02 09:56:35 +02:00
TheBusyBiscuit
5ba6ea867f Updated to CS-CoreLib2 v0.3.10 2019-09-02 01:31:52 +02:00
TheBusyBiscuit
74ecde2c58 Code cleanup 2019-09-02 01:07:32 +02:00
TheBusyBiscuit
d51e906300 Reduced technical debt 2019-09-02 00:15:19 +02:00
TheBusyBiscuit
41bbbdd3dc Fixed various Bugs 2019-09-01 23:35:19 +02:00
TheBusyBiscuit
6dc24d0ff2
Merge pull request #1076 from LinoxGH/master
Fixes #253
2019-09-01 23:21:47 +02:00
TheBusyBiscuit
90327e6908 Refactoring 2019-09-01 23:21:01 +02:00
ajan-12
9c9a3bb6ba Implementing postRegister() and doing the requested change. 2019-09-01 23:07:16 +03:00
ajan-12
5ed152b1e7 Fixing a mistake in syncing. 2019-09-01 22:59:43 +03:00
ajan-12
bafd526a79 Syncing with the changes in main repo. 2019-09-01 22:49:27 +03:00
ajan-12
fa056c8d04 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
# Conflicts:
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java
2019-09-01 22:46:27 +03:00
ajan-12
4b821c1559 Some code cleanup and finally fixed #253. 2019-09-01 22:42:04 +03:00
TheBusyBiscuit
7ec4924665 Fixed default Items.yml for BlockPlacer 2019-09-01 21:02:10 +02:00
TheBusyBiscuit
92219b6435 Fixed Lightning Rune Recipe 2019-09-01 20:43:05 +02:00