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

991 Commits

Author SHA1 Message Date
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
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