1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

262 Commits

Author SHA1 Message Date
TheBusyBiscuit
695ed72f0c Changed Ignition Chamber Recipe 2019-10-01 18:47:48 +02:00
TheBusyBiscuit
0a540aa16a Removed the Saw Mill from Slimefun 2019-09-27 21:11:26 +02:00
TheBusyBiscuit
c82f61a58d
Merge branch 'master' into constructor_cleanup 2019-09-26 20:54:01 +02:00
TheBusyBiscuit
fd76555ea1 Fixed Basic Machines not showing all recipes 2019-09-26 20:09:03 +02:00
Liruxo
2e340be7ff Multiblock constructor refactor 2019-09-26 18:07:58 +02:00
TheBusyBiscuit
526a209fa3 Update 2019-09-26 15:32:20 +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
dcee66839f Added Portable GEO-Scanner, Uranium Resources and improved gps 2019-09-23 17:50:35 +02:00
TheBusyBiscuit
d18409bfc4 Refactored Messages 2019-09-21 13:59:15 +02:00
TheBusyBiscuit
c7040d09be Reduced technical debt + Fixes #1095 2019-09-06 10:34:17 +02:00
TheBusyBiscuit
32e280879e
Merge pull request #1092 from WalshyDev/master
Micro-optimisations
2019-09-06 00:27:58 +02:00
TheBusyBiscuit
26750e5cfc Reduced technical debt 2019-09-06 00:17:14 +02:00
WalshyDev
9ff32fb72e Micro-optimisations 2019-09-05 23:09:25 +01: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
861ddba869 Fixes #1084 2019-09-04 20:55:45 +02:00
TheBusyBiscuit
f623c5d2ea Reduced technical debt 2019-09-04 19:42:17 +02: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
TheBusyBiscuit
4651baf13f Code Cleanup 2019-09-03 16:44:59 +02:00
TheBusyBiscuit
4282bfee5d Reduced technical debt 2019-09-03 13:06:24 +02:00
TheBusyBiscuit
dd14816504 Added Blue Ice to Freezer 2019-09-02 11:25:06 +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
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
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
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
3ec3efb137 Hopefully Fixed #253. 2019-09-01 20:34:26 +03:00
TheBusyBiscuit
224510d2cc Added ItemConsumptionHandler 2019-09-01 19:31:12 +02:00
TheBusyBiscuit
42cdd8494b Fixed Storm Staff bypassing PVP-free Worlds 2019-09-01 18:54:18 +02: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
TheBusyBiscuit
bb50dcaf73 Reduced technical debt 2019-09-01 13:47:39 +02: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
4180a2f2c2
Merge pull request #1071 from Sfiguz7/master
Removed unnecessary array creations
2019-08-31 20:28:19 +02:00
TheBusyBiscuit
6c4de35327 Reduced Code Smells 2019-08-31 20:27:59 +02:00
Sfiguz7
08cdd595ba Removed unnecessary array creations 2019-08-31 19:45:39 +02:00
TheBusyBiscuit
8d8c229081 Logger Conversion Pt.3 2019-08-31 14:17:25 +02:00
TheBusyBiscuit
89240ccb95 Large Refactoring 2019-08-31 13:40:20 +02:00
TheBusyBiscuit
e78e749e94 Insanely huge Refactoring 2019-08-31 11:36:45 +02:00
LinoxGH
4c30764dac
Improved the Storm Staff recipe a bit. 2019-08-31 02:15:41 +03:00