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,304 Commits 1 Branch 0 Tags 64 MiB
32e280879e
Commit Graph

1014 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
fb0cd04b81 Refactored Network classes 2019-08-30 23:55:40 +02:00
TheBusyBiscuit
d8d7212a29
Merge branch 'master' into master 2019-08-30 23:23:12 +02:00
TheBusyBiscuit
9aa7845293 Refactored Code 2019-08-30 23:21:34 +02:00
Sfiguz7
d5f8fb465f Fixes#2 2019-08-30 23:21:33 +02:00
Sfiguz7
3da4dce1f6 Fixes 2019-08-30 23:12:47 +02:00
TheBusyBiscuit
24ec50e072 Removed even more empty methods 2019-08-30 23:11:37 +02:00
Sfiguz7
e253f1dc43 Static non-final names compliance changes 2019-08-30 22:58:46 +02:00
TheBusyBiscuit
43e6b5875c Made a constant out of this variable 2019-08-30 22:58:09 +02:00
TheBusyBiscuit
2940db51ad Refactoring 2019-08-30 22:56:44 +02:00
Sfiguz7
29a8d81345 Local variables name compliance changes 2019-08-30 22:49:18 +02:00
TheBusyBiscuit
591160a45f Removed more empty methods 2019-08-30 22:41:58 +02:00
LinoxGH
60977a01c6
Doing the requested changes. 2019-08-30 23:39:14 +03:00
TheBusyBiscuit
1615f5948d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-08-30 22:30:18 +02:00
TheBusyBiscuit
d14ef3891a Cleared another empty method 2019-08-30 22:30:03 +02:00
TheBusyBiscuit
1b27287f15
Merge pull request #1068 from Sfiguz7/master 
Removed empty methods
 2019-08-30 22:18:51 +02:00
TheBusyBiscuit
1de54daf5d Refactoring 2019-08-30 22:18:36 +02:00
Sfiguz7
a5eeb7c414 Removed empty methods 2019-08-30 22:05:49 +02:00
TheBusyBiscuit
dc1de711b0 Removed debug message 2019-08-30 21:51:37 +02:00
TheBusyBiscuit
f9bbfdc869 Changed Pressure Chamber and Table Saw Slabs 2019-08-30 21:48:11 +02:00
LinoxGH
9818d8bb08
Adding the Storm Staff to SlimefunSetup.java. 2019-08-30 22:32:37 +03:00
LinoxGH
efdb9d12dc
Adding the Storm Staff Research. 2019-08-30 22:29:57 +03:00
LinoxGH
6cca1f8833
Adding Storm Staff to SlimefunItems.java and removing redundant "&7"s. 2019-08-30 22:28:40 +03:00
TheBusyBiscuit
adb8194d84 Reduced technical debt for Androids 2019-08-30 21:14:46 +02:00
TheBusyBiscuit
b6be4af90d Updated SlimefunBlockHandler 2019-08-30 21:02:55 +02:00
TheBusyBiscuit
5ec7a27b2b Fixed Multiblocks 2019-08-30 20:41:39 +02:00
TheBusyBiscuit
0fd44d2136 Reduced technical debt 2019-08-30 13:47:58 +02:00
TheBusyBiscuit
7afcfda89a Fixes #1064 2019-08-30 12:54:22 +02:00
TheBusyBiscuit
c378697f42 More Cleanup 2019-08-30 12:47:22 +02:00
TheBusyBiscuit
7e63ad9040 Removed a bunch of deprecated code 2019-08-30 12:13:45 +02:00
TheBusyBiscuit
5793508144 Fixed Exception when doing /sf stats 2019-08-30 12:00:28 +02:00
TheBusyBiscuit
4cd9628786 Retextured Categories + fixed server-crash when using Flasks of 
Knowledges really fast
 2019-08-30 11:49:45 +02:00
TheBusyBiscuit
1ec935b334 More Code Cleanup 2019-08-30 11:28:27 +02:00
TheBusyBiscuit
09354e0be1 Refactored code 2019-08-30 11:15:26 +02:00
TheBusyBiscuit
2e89de4d3a Code cleanup 2019-08-30 09:21:49 +02:00
TheBusyBiscuit
5fa929e633 Reduced technical debt 2019-08-30 01:40:18 +02:00
TheBusyBiscuit
edade50abf Fixed infinite Diet Cookie Glitch 2019-08-30 01:26:16 +02:00
TheBusyBiscuit
6c18d368a1 Fixed Typo 2019-08-30 01:19:54 +02:00
TheBusyBiscuit
f8ad7bd13c Hotfix 2019-08-30 01:15:21 +02:00
TheBusyBiscuit
7fe97e6813
Merge pull request #1062 from LinoxGH/master 
Adding the Diet Cookie.
 2019-08-30 01:11:56 +02:00
TheBusyBiscuit
07271edc47 Reduced technical debt 2019-08-30 01:11:33 +02:00
LinoxGH
6c6b6326a7
Did the requested changes. 2019-08-30 02:01:43 +03:00
TheBusyBiscuit
a83266104e More Refactoring 2019-08-30 00:43:17 +02:00
TheBusyBiscuit
69d3990c64
Merge pull request #1060 from Sfiguz7/master 
Bigger code cleaning
 2019-08-30 00:25:41 +02:00
ajan-12
2de2ac519d Fixing Diet Cookie not being consumed. 2019-08-30 01:24:22 +03:00
ajan-12
30d3dfe038 Adding Diet Cookie. 
- A Cookie made by an elytra scale and a cookie!
- Levitates the player for 3 seconds.
 2019-08-30 01:12:02 +03:00
Sfiguz7
c11eb54037 Cleaning 2019-08-29 23:18:04 +02:00
Sfiguz7
7c6d722283 Cleaned constructors' diamond operators 2019-08-29 22:52:46 +02:00