mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
1,397 Commits 1 Branch 0 Tags 64 MiB
74ee019603
Commit Graph

341 Commits

Author SHA1 Message Date
TheBusyBiscuit
695ed72f0c Changed Ignition Chamber Recipe 2019-10-01 18:47:48 +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
0743d05311 Localization 2019-09-30 19:33:44 +01:00
SoSeDiK
abf00e038b Use tabs everywhere 2019-09-30 19:33:35 +03:00
SoSeDiK
f45c40e103 Fix NPE on loading without CS-CoreLib 2019-09-30 19:20:08 +03: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
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
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
dcee66839f Added Portable GEO-Scanner, Uranium Resources and improved gps 2019-09-23 17:50:35 +02:00
TheBusyBiscuit
a31a30b6af Reduced technical debt 2019-09-21 16:21:10 +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
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
7c50faf140 Changed item-permission to be per item rather than one global list 2019-09-08 03:47:09 -07: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
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
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
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
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
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
40f2ef862a Minor performance improvement 2019-09-02 09:56:35 +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