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,610 Commits 1 Branch 0 Tags 64 MiB
87caf6ee45
Commit Graph

1610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
1c12b892fe
Merge pull request #1203 from J3fftw1/veinminerfix 
fixes #1202
 2019-10-20 14:25:25 +02:00
J3fftw1
852b4bfc2a fixes #1202 2019-10-20 14:19:27 +02:00
TheBusyBiscuit
ad3ca513ad Fixed Multi Tools 2019-10-19 19:06:38 +02:00
TheBusyBiscuit
783a66d2da Fixed Food 2019-10-19 18:20:08 +02:00
TheBusyBiscuit
bb2d9d851f Fixes #1153 2019-10-19 18:18:17 +02:00
TheBusyBiscuit
41811b90f1 [CI skip] Added some documentation to the code 2019-10-19 16:48:22 +02:00
TheBusyBiscuit
a3bf63a023 More optimizations (+ Added more Jerky Meat) 2019-10-19 16:16:40 +02:00
TheBusyBiscuit
3eed8cebc6 Another fix 2019-10-19 15:15:11 +02:00
TheBusyBiscuit
70cc1d04f4 Fixes #1196 2019-10-19 15:14:05 +02:00
TheBusyBiscuit
c5341a6b02 Fixes #1196 2019-10-19 15:04:45 +02:00
TheBusyBiscuit
fc7c4e4d81 Fixed #1200 2019-10-19 12:53:13 +02:00
TheBusyBiscuit
260c3a51dd More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer) 2019-10-19 10:30:15 +02:00
TheBusyBiscuit
86e575b61f
Merge pull request #1199 from AlexLander123/fixes 
Allow /sf cheat to have all categories unlocked
 2019-10-19 09:56:47 +02:00
AlexLander123
1dc669740c Allow /sf cheat to have all categories unlocked 
- If the player who who is using /sf cheat have not unlocked the category, they will still have access to it
- Removed empty code
 2019-10-18 21:27:28 +08:00
TheBusyBiscuit
2ff2355bb2
Merge pull request #1198 from J3fftw1/asd 
Fixed ExplosivePickaxe
 2019-10-18 07:36:32 +02:00
J3fftw1
576b297b50 Fixed ExplosivePickaxe 2019-10-18 00:15:48 +02:00
TheBusyBiscuit
765f4e47e0
Merge pull request #1197 from J3fftw1/asd 
fixed broken items
 2019-10-17 23:30:19 +02:00
J3fftw1
470f5f1afe fixed requested changes 2019-10-17 23:23:25 +02:00
J3fftw1
10fe7238ad fixed broken items 2019-10-17 23:14:43 +02:00
TheBusyBiscuit
06e3125a6d Repositioned back button for guide search 2019-10-17 01:33:49 +02:00
TheBusyBiscuit
f71b925a41 Improved Guide Search 2019-10-17 01:27:00 +02:00
TheBusyBiscuit
a5d0c751d5 Fixed Guide Search's back button 2019-10-17 01:25:10 +02:00
TheBusyBiscuit
ee6dfae045 Fixed Guide Search's back button 2019-10-17 01:21:04 +02:00
TheBusyBiscuit
5fa021469f Added a logging message 2019-10-17 01:12:47 +02:00
TheBusyBiscuit
07827ecc53 Moved Guide History to Player Profiles 2019-10-17 01:08:14 +02:00
TheBusyBiscuit
45a688e148 Added wiki pages to the guide 2019-10-17 00:49:55 +02:00
TheBusyBiscuit
18b5bda4a8 [CI skip] Introduced proper Maven structure 2019-10-17 00:37:46 +02:00
TheBusyBiscuit
4a44783bf6
Merge pull request #1189 from J3fftw1/fix/fixed-broken-items 
fixed broken items credits to walshy
 2019-10-16 18:38:54 +02:00
J3fftw1
bce67f395c fixed 2019-10-16 18:19:06 +02:00
J3fftw1
e7c75d772e OKAY NOW IT SHOULD BE FIXED 2019-10-16 17:59:52 +02:00
J3fftw1
a5907939ac fixed 2 errors 2019-10-16 17:46:49 +02:00
J3fftw1
73130bc21b Merge branch 'fix/fixed-broken-items' of https://github.com/J3fftw1/Slimefun4 into fix/fixed-broken-items 
# Conflicts:
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java
#	src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java
 2019-10-16 17:15:22 +02:00
J3fftw1
4b21732ee9 fixed requested changes 
and re added EnhancedFurnace
Becuase of some reason Retard Panda removed it
 2019-10-16 17:14:51 +02:00
J3fftw1
90f3141aec
Update WindStaff.java 2019-10-16 00:51:31 +02:00
J3fftw1
984f9295a2
Update TelepositionScroll.java 2019-10-16 00:51:12 +02:00
J3fftw1
91d10029e1
Update StormStaff.java 2019-10-16 00:50:56 +02:00
J3fftw1
e5f02a5fea
Update SeismicAxe.java 2019-10-16 00:50:36 +02:00
J3fftw1
3159a2649e
Update PortableGEOScanner.java 2019-10-16 00:50:24 +02:00
J3fftw1
da186362f4
Update PortableDustbin.java 2019-10-16 00:50:12 +02:00
J3fftw1
c31db3fa53
Update PortableCrafter.java 2019-10-16 00:49:58 +02:00
J3fftw1
5ad033bb62
Update PickaxeOfTheSeeker.java 2019-10-16 00:49:41 +02:00
J3fftw1
208bd58b00
Update MagicEyeOfEnder.java 2019-10-16 00:49:24 +02:00
J3fftw1
05fcc0b031
Update MagicSugar.java 2019-10-16 00:49:05 +02:00
J3fftw1
3d7877b4c4
Update LumberAxe.java 2019-10-16 00:48:48 +02:00
J3fftw1
a4cb17a48d
Update KnowledgeTome.java 2019-10-16 00:47:37 +02:00
J3fftw1
2740c58c64
Update KnowledgeFlask.java 2019-10-16 00:47:18 +02:00
J3fftw1
29bb302872
Update InfernalBonemeal.java 2019-10-16 00:47:05 +02:00
J3fftw1
0fb050b718
Update GrapplingHook.java 2019-10-16 00:46:52 +02:00
J3fftw1
8f9e7a1078
Update GoldPan.java 2019-10-16 00:46:36 +02:00
J3fftw1
743a75bd5c
Update EnderBackpack.java 2019-10-16 00:46:17 +02:00