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

1986 Commits

Author SHA1 Message Date
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
J3fftw1
419e226aa7
Delete EnhancedFurnace.java 2019-10-16 00:44:49 +02:00
TheBusyBiscuit
72d1416c59
[CI skip] Merge pull request #1190 from WalshyDev/patch-2
GitHub made dumb stuff
2019-10-16 00:33:52 +02:00
Daniel Walsh
76735a6159
GitHub made dumb stuff 2019-10-15 23:25:34 +01:00
J3fftw1
5547b57da9 fixed broken items credits to walshy 2019-10-16 00:17:24 +02:00
TheBusyBiscuit
20e3f2b9ce Some more bug fixes and optimizations 2019-10-14 20:50:57 +02:00
TheBusyBiscuit
7e0eb29040 Minor optimization 2019-10-14 17:58:15 +02:00
TheBusyBiscuit
b2fd914cee Fixed Backpacks 2019-10-14 17:18:37 +02:00
TheBusyBiscuit
6865ab8c6c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-14 17:18:08 +02:00
TheBusyBiscuit
fef43314f9 Fixed Backpacks not working 2019-10-14 17:17:50 +02:00
TheBusyBiscuit
fb652fe41d Another fix 2019-10-14 09:54:23 +02:00
TheBusyBiscuit
2a475811de Fixes #1180 (+ Improvements on MultiTool performance) 2019-10-14 09:31:14 +02:00
TheBusyBiscuit
46cbfc2823
Merge pull request #1178 from creator3/master
Fix major BlockStorage performance regression
2019-10-14 07:07:54 +02:00
creator3
9551bf5a5c
Fix major BlockStorage performance regression 2019-10-13 19:01:00 -04:00
TheBusyBiscuit
090f45d93f
Merge pull request #1176 from WalshyDev/qol/improved-timings
Order timings
2019-10-13 19:05:16 +02:00
TheBusyBiscuit
005fbbdd13 Minor changes and optimizations 2019-10-13 19:05:04 +02:00
Daniel Walsh
d2e1dabf47 okie 2019-10-13 17:45:54 +01:00
TheBusyBiscuit
3239616f50 Hotfix 2 2019-10-13 18:44:59 +02:00
Daniel Walsh
8b4d927753 Fix NPE 2019-10-13 17:33:58 +01:00
Daniel Walsh
22a9f8955a Improve and also order console output 2019-10-13 17:32:42 +01:00
TheBusyBiscuit
a1e55d0d92 Hotfix 2019-10-13 18:26:18 +02:00
TheBusyBiscuit
2fc05354a0 Some more optimizations 2019-10-13 18:14:25 +02:00
Daniel Walsh
5c5214beba Fix 2 2019-10-13 17:06:45 +01:00
TheBusyBiscuit
e0d1a71453 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-10-13 16:37:28 +02:00
TheBusyBiscuit
819a59d3a4 [CI skip] Micro-optimizations 2019-10-13 16:37:13 +02:00