mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
1,356 Commits 1 Branch 0 Tags 64 MiB
4f38890dc3
Commit Graph

1029 Commits

Author SHA1 Message Date
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
7399e1f0d1 Hopefully did the requested changes for the last time. 2019-09-05 22:36:27 +03:00
ajan-12
63a261d51c Did the requested changes vol.infinite 2019-09-05 20:43:36 +03: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
307a4394ff Improved Guide Performance + Refactoring 2019-09-05 13:43:41 +02:00
TheBusyBiscuit
25e6dd337b Improved Slimefun Guide Performance 2019-09-05 13:29:19 +02: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
38b2112aaf Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-09-04 19:42:26 +02:00
TheBusyBiscuit
f623c5d2ea Reduced technical debt 2019-09-04 19:42:17 +02:00
TheBusyBiscuit
6ad5bd8324
Merge pull request #1078 from xH3LLRAIZ3Rx/master 
Added item-permission in messages
 2019-09-04 09:54:33 +02:00
TheBusyBiscuit
af40186418 Updated dependencies 2019-09-04 09:54:24 +02:00
Alex Mercer
6811147292 Changed the code one more time 2019-09-03 23:55:20 -07: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
00de4d9361 Refactored Code 2019-09-03 13:09:58 +02:00
TheBusyBiscuit
4282bfee5d Reduced technical debt 2019-09-03 13:06:24 +02:00
Alex Mercer
b694c9edac Changed code again 2019-09-03 01:51:20 -07:00
TheBusyBiscuit
a49877964e Reduced technical debt 2019-09-02 23:14:48 +02:00
Alex Mercer
0961c8bf1a Changed code 2019-09-02 04:43:11 -07:00
TheBusyBiscuit
38c4333d72 Retextured Categories 2019-09-02 13:36:34 +02:00
Alex Mercer
b8e2eede55 Changed messages.item-permission to tooltips.item-permission 2019-09-02 03:31:06 -07:00
Alex Mercer
a8151ec58b Added item-permission 2019-09-02 03:19:10 -07:00
TheBusyBiscuit
6473988df4 Fixed Durability Enchantment on damageable Items 2019-09-02 11:27:32 +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
08f672600a A little code improvement. 2019-09-01 23:54:59 +03: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
01fe513532 Small bug fix 2019-09-01 20:43:35 +02:00
TheBusyBiscuit
92219b6435 Fixed Lightning Rune Recipe 2019-09-01 20:43:05 +02:00
TheBusyBiscuit
dd0bb1ef8b Minor Bug Fixes 2019-09-01 20:29:16 +02:00
ajan-12
1cd47fd3dd Removed more redundant lines. 2019-09-01 21:02:52 +03:00
ajan-12
2a9eeaaa96 Code Refactored and fixed grappling hook dupe. 2019-09-01 21:00:19 +03:00
ajan-12
bb7bf903d3 Forgot to register the grappling hook. 2019-09-01 20:55:11 +03:00
ajan-12
8278d00dcf Optimized imports a bit. 2019-09-01 20:41:11 +03:00
TheBusyBiscuit
2fbad51e53 Fixed damageable Items 2019-09-01 19:37:29 +02:00
ajan-12
3ec3efb137 Hopefully Fixed #253. 2019-09-01 20:34:26 +03:00
TheBusyBiscuit
b76328168b Fixed BlockPlacer 2019-09-01 19:32:38 +02:00
TheBusyBiscuit
224510d2cc Added ItemConsumptionHandler 2019-09-01 19:31:12 +02:00
TheBusyBiscuit
3e7554f497
Merge pull request #1074 from LinoxGH/master 
A quick hotfix for diet cookies crashing the server.
 2019-09-01 18:54:51 +02:00
TheBusyBiscuit
42cdd8494b Fixed Storm Staff bypassing PVP-free Worlds 2019-09-01 18:54:18 +02:00
TheBusyBiscuit
2056e62e01 Fixed Explosive Shovel duplication bug 2019-09-01 18:53:02 +02:00
ajan-12
a819d4ece2 Fixing Diet Cookie crashing the server. 2019-09-01 19:39:28 +03:00
TheBusyBiscuit
d9ce39f93b Refactored Code 2019-09-01 14:47:03 +02:00
TheBusyBiscuit
dbe37ee6a9 Added Lightning Rune 2019-09-01 14:31:08 +02:00
TheBusyBiscuit
7b5f44a7f0
Merge pull request #1067 from LinoxGH/master 
Added Storm Staff.
 2019-09-01 14:09:49 +02:00
TheBusyBiscuit
bb50dcaf73 Reduced technical debt 2019-09-01 13:47:39 +02:00
LinoxGH
06a7072b4c
Adding no PvP message. 2019-09-01 14:32:42 +03:00
TheBusyBiscuit
76004c3df9 Reduced technical debt 2019-09-01 11:42:03 +02:00
LinoxGH
0cd5e79ddd
Merge branch 'master' into master 2019-09-01 12:41:22 +03:00
ajan-12
d5a8bade3e Code cleanup and doing the requested changes. 2019-09-01 12:38:43 +03:00
TheBusyBiscuit
ed1bf015b7 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-08-31 20:34:28 +02:00
TheBusyBiscuit
8be6f9cebb Hotfix 2019-08-31 20:34:10 +02:00
TheBusyBiscuit
4180a2f2c2
Merge pull request #1071 from Sfiguz7/master 
Removed unnecessary array creations
 2019-08-31 20:28:19 +02:00
TheBusyBiscuit
6c4de35327 Reduced Code Smells 2019-08-31 20:27:59 +02:00
TheBusyBiscuit
10f3dae550 Fixed Color Character in Elevator Floor names 2019-08-31 20:09:25 +02:00
Sfiguz7
08cdd595ba Removed unnecessary array creations 2019-08-31 19:45:39 +02:00
TheBusyBiscuit
edeef7c14d Logger Conversion Pt.5 2019-08-31 17:52:20 +02:00
TheBusyBiscuit
2f5177b785 Refactored Code 2019-08-31 15:52:52 +02:00
TheBusyBiscuit
6eb3cee4a2 Reduced technical debt 2019-08-31 15:52:15 +02:00
TheBusyBiscuit
91f31d361a Logger Conversion Pt.4 2019-08-31 15:07:27 +02:00
TheBusyBiscuit
8d8c229081 Logger Conversion Pt.3 2019-08-31 14:17:25 +02:00
TheBusyBiscuit
89240ccb95 Large Refactoring 2019-08-31 13:40:20 +02:00
TheBusyBiscuit
01fd2cd38c Logger Conversion Pt.2 2019-08-31 12:54:54 +02:00
TheBusyBiscuit
c293605312 Logger Conversion Pt.1 2019-08-31 12:12:38 +02:00
TheBusyBiscuit
e78e749e94 Insanely huge Refactoring 2019-08-31 11:36:45 +02:00
TheBusyBiscuit
b9be211b7f
Merge pull request #1070 from Sfiguz7/master 
Conditional structures dupe codes cleaning
 2019-08-31 09:39:48 +02:00
LinoxGH
4c30764dac
Improved the Storm Staff recipe a bit. 2019-08-31 02:15:41 +03:00
LinoxGH
cc4a678750
Fixed bugs about Storm Staff. 
- Changed "1 Uses left" to "1 Use left".
- Fixed the recipe.
- Fixed durability not working.
- Fixed a server crash when item breaks.
 2019-08-31 02:13:56 +03:00
Sfiguz7
4fe72148a2 Conditional structures dupe codes cleaning 2019-08-30 23:57:30 +02:00