1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Commit Graph

239 Commits

Author SHA1 Message Date
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
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
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
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
3ec3efb137 Hopefully Fixed #253. 2019-09-01 20:34:26 +03:00
TheBusyBiscuit
224510d2cc Added ItemConsumptionHandler 2019-09-01 19:31:12 +02:00
TheBusyBiscuit
42cdd8494b Fixed Storm Staff bypassing PVP-free Worlds 2019-09-01 18:54:18 +02: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
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
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
Sfiguz7
08cdd595ba Removed unnecessary array creations 2019-08-31 19:45:39 +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
e78e749e94 Insanely huge Refactoring 2019-08-31 11:36:45 +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
d8d7212a29
Merge branch 'master' into master 2019-08-30 23:23:12 +02:00
Sfiguz7
3da4dce1f6 Fixes 2019-08-30 23:12:47 +02:00
Sfiguz7
e253f1dc43 Static non-final names compliance changes 2019-08-30 22:58:46 +02:00
TheBusyBiscuit
2940db51ad Refactoring 2019-08-30 22:56:44 +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
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
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
TheBusyBiscuit
5ec7a27b2b Fixed Multiblocks 2019-08-30 20:41:39 +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