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

1403 Commits

Author SHA1 Message Date
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
dde0f5c34e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-09-01 23:21:19 +02:00
TheBusyBiscuit
90327e6908 Refactoring 2019-09-01 23:21:01 +02:00
TheBusyBiscuit
e971b37c5f
Update PULL_REQUEST_TEMPLATE.md 2019-09-01 23:16:51 +02:00
TheBusyBiscuit
e126b82930
Merge pull request #1077 from WalshyDev/patch-1
Fix TODO items
2019-09-01 23:16:34 +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
Daniel Walsh
73896e1885
Fix TODOs 2019-09-01 20:56:08 +01:00
Daniel Walsh
5dc9048983
Update features.md 2019-09-01 20:55:12 +01: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
71896617e4
Created Pull Request Templates 2019-09-01 19:10:52 +02:00
TheBusyBiscuit
8e73f94a3a
Update fix.md 2019-09-01 19:10:19 +02:00
TheBusyBiscuit
cd22ad7d53
Update features.md 2019-09-01 19:09:56 +02:00
TheBusyBiscuit
37f57bd101
Create fix.md 2019-09-01 19:05:39 +02:00
TheBusyBiscuit
1eb2c217d9
Create features.md 2019-09-01 19:05:09 +02:00
TheBusyBiscuit
62a4584a22
Update README.md 2019-09-01 18:58:17 +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
LinoxGH
cc381bbb61
Shaded Protection package. 2019-09-01 14:58:45 +03: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
f297cd561a
Merge pull request #1073 from TheBusyBiscuit/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.thebusybiscuit:CS-CoreLib2 to v0.3.9
2019-09-01 11:08:01 +02:00