J3fftw1
55efcc454c
Update TeleportationSequence.java
2019-10-03 22:46:18 +02:00
TheBusyBiscuit
f818668ba0
You can no longer cheat in Multiblocks (+ Code cleanup)
2019-10-03 18:06:14 +02:00
TheBusyBiscuit
fdb0d011ef
Reworked some internal stuff
2019-10-02 13:54:59 +02:00
TheBusyBiscuit
74ee019603
Smeltery now shows all its "1 component"-Recipes in the Guide
2019-10-01 18:48:13 +02:00
TheBusyBiscuit
695ed72f0c
Changed Ignition Chamber Recipe
2019-10-01 18:47:48 +02:00
TheBusyBiscuit
db0b6dfa90
Fixed Stone Chunk -> Cobblestone Recipe not working
2019-10-01 18:47:40 +02:00
TheBusyBiscuit
431892abb2
Updated some deprecated methods
2019-10-01 17:04:09 +02:00
TheBusyBiscuit
21582610ad
Updated to CS-CoreLib2 v0.5.6
2019-10-01 13:14:50 +02:00
TheBusyBiscuit
ff85e4d894
Merge pull request #1138 from WalshyDev/feature/guide-search
...
Guide Search!
2019-10-01 02:58:56 +02:00
TheBusyBiscuit
7cac093419
Updated CS-CoreLib2 and refactored commands
2019-10-01 02:57:58 +02:00
Daniel Walsh
00ef4d59e8
I hate life
2019-09-30 19:36:08 +01:00
Daniel Walsh
0743d05311
Localization
2019-09-30 19:33:44 +01:00
Daniel Walsh
b0b55f13ad
Oops, unused import
2019-09-30 18:14:54 +01:00
Daniel Walsh
570319b5ae
Switch to MenuHelper.awaitChatInput
2019-09-30 18:06:50 +01:00
TheBusyBiscuit
3d8d9ed624
Merge pull request #1139 from SoSeDiK/npe
...
Fix two NPEs when loading without CS-CoreLib
2019-09-30 18:40:57 +02:00
SoSeDiK
abf00e038b
Use tabs everywhere
2019-09-30 19:33:35 +03:00
SoSeDiK
c56225d051
Fix NPE on disabling without CS-CoreLib
2019-09-30 19:21:33 +03:00
SoSeDiK
f45c40e103
Fix NPE on loading without CS-CoreLib
2019-09-30 19:20:08 +03:00
TheBusyBiscuit
4bb9abd247
Fixed stable-builds Updater
2019-09-30 00:04:43 +02:00
WalshyDev
52f078a025
Finish search
2019-09-28 16:13:23 +01:00
WalshyDev
fd4f92326d
Cleanup
2019-09-27 20:40:51 +01:00
TheBusyBiscuit
0a540aa16a
Removed the Saw Mill from Slimefun
2019-09-27 21:11:26 +02:00
TheBusyBiscuit
cff45aae66
Updated CS-CoreLib2 dependency
2019-09-27 21:08:57 +02:00
TheBusyBiscuit
c4a5705c44
Fixes #1130
2019-09-27 20:28:49 +02:00
TheBusyBiscuit
48aabe752d
Fixes #1129
2019-09-27 09:02:17 +02:00
TheBusyBiscuit
c82f61a58d
Merge branch 'master' into constructor_cleanup
2019-09-26 20:54:01 +02:00
TheBusyBiscuit
229b0f8e87
Fixed double-registration of basic machine recipes
2019-09-26 20:32:59 +02:00
TheBusyBiscuit
dd5965eeac
Reduced technical debt
2019-09-26 20:22:28 +02:00
TheBusyBiscuit
fd76555ea1
Fixed Basic Machines not showing all recipes
2019-09-26 20:09:03 +02:00
Liruxo
b7ec184364
Added Deprecated Compatibility Constructors
2019-09-26 18:42:47 +02:00
Liruxo
2e340be7ff
Multiblock constructor refactor
2019-09-26 18:07:58 +02:00
TheBusyBiscuit
3a4a1ac96e
Merge pull request #1127 from TheBusyBiscuit/geo
...
GEO Miner
2019-09-26 15:36:36 +02:00
TheBusyBiscuit
526a209fa3
Update
2019-09-26 15:32:20 +02:00
TheBusyBiscuit
4f38890dc3
Added GEO Miner Research
2019-09-26 15:25:42 +02:00
TheBusyBiscuit
2b89c41e3e
Updated GEO Scanner
2019-09-26 15:23:27 +02:00
TheBusyBiscuit
965cdc8165
Adjusted ore spawn-rates
2019-09-26 15:22:42 +02:00
TheBusyBiscuit
3ed959ed1c
Updated GEO-Miner
2019-09-26 15:15:33 +02:00
TheBusyBiscuit
016b1c84eb
Added GEO Miner
2019-09-26 15:09:19 +02:00
TheBusyBiscuit
cc29dd6333
Refactoring
2019-09-26 13:53:36 +02:00
TheBusyBiscuit
65962d3689
Added more bStats Charts
2019-09-26 12:58:35 +02:00
TheBusyBiscuit
5a591e4f7e
Tweaked Auto-Updater
2019-09-26 08:21:49 +02:00
TheBusyBiscuit
98b6607db6
Updated Miner Hologram
2019-09-25 14:19:34 +02:00
TheBusyBiscuit
f4e2c97327
Added GEO-Miner
2019-09-25 14:17:06 +02:00
TheBusyBiscuit
dcee66839f
Added Portable GEO-Scanner, Uranium Resources and improved gps
2019-09-23 17:50:35 +02:00
TheBusyBiscuit
28a4205e8c
Added pagination to Machine Recipes ( Resolves #1005 )
2019-09-21 21:40:54 +02:00
TheBusyBiscuit
a31a30b6af
Reduced technical debt
2019-09-21 16:21:10 +02:00
TheBusyBiscuit
0f7f31f8ba
Reduced technical debt
2019-09-21 14:54:55 +02:00
TheBusyBiscuit
d18409bfc4
Refactored Messages
2019-09-21 13:59:15 +02:00
TheBusyBiscuit
1af7c8cbf0
Fixes #1116
2019-09-21 13:04:36 +02:00
ajan-12
e6a6d2838f
Fixed a little typo.
2019-09-19 08:54:23 +03:00
TheBusyBiscuit
25ee04bb89
Merge pull request #1117 from WalshyDev/fix/fix-storm-staff-usages
...
Improve storm staff usages
2019-09-11 12:21:38 +02:00
TheBusyBiscuit
580931d729
Updated to CS-CoreLib 2 v0.5.1
2019-09-11 11:53:05 +02:00
WalshyDev
0219de80b2
remove unused import
2019-09-10 22:37:40 +01:00
WalshyDev
4468c8a382
Fix lore
2019-09-10 21:58:28 +01:00
WalshyDev
d3b13e62f5
Fix storm staff usage bug
...
Also improve the way it is done, there was no way to go through all possible usages checking the lore on each one...
Downside: It will reset the usage on current items due to it being saved/loaded in a different way
2019-09-10 21:36:34 +01:00
WalshyDev
b70d4fc258
Fix hasUnlocked usages
2019-09-10 16:28:08 +01:00
WalshyDev
181165300e
Replace item checks with ID checks
2019-09-10 16:10:26 +01:00
WalshyDev
b7714efbac
Fix #1104
...
Also improves performance and formatting
2019-09-10 15:25:47 +01:00
TheBusyBiscuit
4662144309
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2019-09-09 20:59:07 +02:00
TheBusyBiscuit
256428489b
Increased technical debt via deprecation :P
2019-09-09 20:58:46 +02:00
TheBusyBiscuit
d5d15a60ec
Merge pull request #1099 from LinoxGH/master
...
Fixes #1098 .
2019-09-09 12:45:24 +02:00
TheBusyBiscuit
dfc23277a8
Merge pull request #1100 from xH3LLRAIZ3Rx/master
...
Changed item-permission message to be per item rather than one global list
2019-09-09 12:45:13 +02:00
Alex Mercer
834fddf84d
Changed permission-message and other things
2019-09-08 19:10:53 -07:00
LinoxGH
a00d2c9f59
Hopefully fizes #1098 in a better way.
2019-09-08 17:20:12 +03:00
Alex Mercer
ead25ceaac
Changed it again
2019-09-08 06:22:15 -07:00
Alex Mercer
22fcb992fd
Changed the way it works
2019-09-08 06:04:50 -07:00
Alex Mercer
7c50faf140
Changed item-permission to be per item rather than one global list
2019-09-08 03:47:09 -07:00
ajan-12
643cfadaf4
Fixes #1098 .
2019-09-08 10:12:45 +03:00
ajan-12
23819a1d83
Fixes #1085 for real.
2019-09-07 00:15:17 +03:00
ajan-12
5c9ba0a94f
Hopefully fixes #1085
2019-09-06 23:57:47 +03:00
TheBusyBiscuit
bc7d92468c
Fixes #1096
2019-09-06 17:35:24 +02:00
TheBusyBiscuit
8fd19dd134
Minor Tweaks and Changes
2019-09-06 13:01:45 +02:00
TheBusyBiscuit
eea131878e
Merge pull request #1094 from xH3LLRAIZ3Rx/master
...
Changed Slimefun Guide sound to Page Turn
2019-09-06 12:25:04 +02:00
Alex Mercer
1eebe69dae
Changed pitch
2019-09-06 03:11:37 -07:00
TheBusyBiscuit
c7040d09be
Reduced technical debt + Fixes #1095
2019-09-06 10:34:17 +02:00
Alex Mercer
41caa1b623
Merge remote-tracking branch 'origin/master'
2019-09-05 22:25:50 -07:00
Alex Mercer
d2defd9a89
Changed volume
2019-09-05 22:25:36 -07:00
Alex Mercer
6341c19906
Merge branch 'master' into master
2019-09-05 22:06:03 -07:00
Alex Mercer
c1c0c99bc8
Changed Slimefun Guide sound to Page Turn
2019-09-05 22:05:06 -07:00
Alex Mercer
0b717626ba
Changed Slimefun Guide sound to Page Turn
2019-09-05 21:59:34 -07:00
TheBusyBiscuit
9293808357
Fixed Multiblocks.
2019-09-06 02:16:45 +02:00
TheBusyBiscuit
5a5651ab38
Fixes #1093
2019-09-06 01:50:53 +02:00
TheBusyBiscuit
32e280879e
Merge pull request #1092 from WalshyDev/master
...
Micro-optimisations
2019-09-06 00:27:58 +02:00
TheBusyBiscuit
e0d12f467a
Removed unused imports
2019-09-06 00:27:50 +02:00
WalshyDev
df7390f9b3
Small improvement
2019-09-05 23:24:09 +01:00
TheBusyBiscuit
26750e5cfc
Reduced technical debt
2019-09-06 00:17:14 +02:00
TheBusyBiscuit
fd77bb6a00
Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
2019-09-06 00:10:50 +02:00
TheBusyBiscuit
96b45868ad
Removed unneeded Holograms
2019-09-06 00:10:37 +02:00
WalshyDev
9ff32fb72e
Micro-optimisations
2019-09-05 23:09:25 +01:00
TheBusyBiscuit
4fd148418c
Merge pull request #1082 from LinoxGH/master
...
Adding Soulbound Rune with the requested changes.
2019-09-05 23:46:17 +02:00
TheBusyBiscuit
5015ddc560
Refactored Code
2019-09-05 23:30:16 +02:00
Liruxo
3f0f794863
Review suggestions implemented
2019-09-05 22:31:08 +02:00
Liruxo
4f89c2d6e5
MultiBlockListener overhaul
2019-09-05 21:41:59 +02:00
ajan-12
7399e1f0d1
Hopefully did the requested changes for the last time.
2019-09-05 22:36:27 +03:00
ajan-12
63a261d51c
Did the requested changes vol.infinite
2019-09-05 20:43:36 +03:00
ajan-12
05bd9337ab
Did the requested changes vol.4
2019-09-05 20:35:16 +03:00
ajan-12
f4da4d2423
Did the requested changes vol.3
2019-09-05 17:38:04 +03:00
ajan-12
441291a9c2
Merge branch 'master' of https://github.com/LinoxGH/Slimefun4
2019-09-05 17:18:48 +03:00
ajan-12
ebde63a04e
Did the requested changes vol.2
2019-09-05 17:16:10 +03:00
LinoxGH
84303891d7
Merge branch 'master' into master
2019-09-05 15:08:19 +03:00
ajan-12
a98517f8cc
Did the requested changes.
2019-09-05 15:02:26 +03:00
TheBusyBiscuit
307a4394ff
Improved Guide Performance + Refactoring
2019-09-05 13:43:41 +02:00
TheBusyBiscuit
25e6dd337b
Improved Slimefun Guide Performance
2019-09-05 13:29:19 +02:00
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
ajan-12
7501dc9afb
Actual commit adding the Soulbound Rune.
...
- Added Soulbound Rune with a research and recipe.
- Did the requested changes.
- Moved isSoulbound check from DamageListener.java to SlimefunManager.java.
- Added a new ItemHandler called ItemDropHandler.
2019-09-03 20:30:58 +03:00
ajan-12
2a8c6265b0
Added Soulbound Rune.
...
- Added Soulbound Rune with a research and recipe.
- Did the requested changes.
- Moved isSoulbound check from DamageListener.java to SlimefunManager.java.
- Added a new ItemHandler called ItemDropHandler.
2019-09-03 20:25:59 +03: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