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

910 Commits

Author SHA1 Message Date
LinoxGH
9818d8bb08
Adding the Storm Staff to SlimefunSetup.java. 2019-08-30 22:32:37 +03:00
LinoxGH
efdb9d12dc
Adding the Storm Staff Research. 2019-08-30 22:29:57 +03:00
LinoxGH
6cca1f8833
Adding Storm Staff to SlimefunItems.java and removing redundant "&7"s. 2019-08-30 22:28:40 +03:00
TheBusyBiscuit
adb8194d84 Reduced technical debt for Androids 2019-08-30 21:14:46 +02:00
TheBusyBiscuit
b6be4af90d Updated SlimefunBlockHandler 2019-08-30 21:02:55 +02:00
TheBusyBiscuit
5ec7a27b2b Fixed Multiblocks 2019-08-30 20:41:39 +02:00
TheBusyBiscuit
0fd44d2136 Reduced technical debt 2019-08-30 13:47:58 +02:00
TheBusyBiscuit
7afcfda89a Fixes #1064 2019-08-30 12:54:22 +02:00
TheBusyBiscuit
c378697f42 More Cleanup 2019-08-30 12:47:22 +02:00
TheBusyBiscuit
7e63ad9040 Removed a bunch of deprecated code 2019-08-30 12:13:45 +02:00
TheBusyBiscuit
5793508144 Fixed Exception when doing /sf stats 2019-08-30 12:00:28 +02:00
TheBusyBiscuit
4cd9628786 Retextured Categories + fixed server-crash when using Flasks of
Knowledges really fast
2019-08-30 11:49:45 +02:00
TheBusyBiscuit
1ec935b334 More Code Cleanup 2019-08-30 11:28:27 +02:00
TheBusyBiscuit
09354e0be1 Refactored code 2019-08-30 11:15:26 +02:00
TheBusyBiscuit
2e89de4d3a Code cleanup 2019-08-30 09:21:49 +02:00
TheBusyBiscuit
5fa929e633 Reduced technical debt 2019-08-30 01:40:18 +02:00
TheBusyBiscuit
edade50abf Fixed infinite Diet Cookie Glitch 2019-08-30 01:26:16 +02:00
TheBusyBiscuit
6c18d368a1 Fixed Typo 2019-08-30 01:19:54 +02:00
TheBusyBiscuit
f8ad7bd13c Hotfix 2019-08-30 01:15:21 +02:00
TheBusyBiscuit
7fe97e6813
Merge pull request #1062 from LinoxGH/master
Adding the Diet Cookie.
2019-08-30 01:11:56 +02:00
TheBusyBiscuit
07271edc47 Reduced technical debt 2019-08-30 01:11:33 +02:00
LinoxGH
6c6b6326a7
Did the requested changes. 2019-08-30 02:01:43 +03:00
TheBusyBiscuit
a83266104e More Refactoring 2019-08-30 00:43:17 +02:00
TheBusyBiscuit
69d3990c64
Merge pull request #1060 from Sfiguz7/master
Bigger code cleaning
2019-08-30 00:25:41 +02:00
ajan-12
2de2ac519d Fixing Diet Cookie not being consumed. 2019-08-30 01:24:22 +03:00
ajan-12
30d3dfe038 Adding Diet Cookie.
- A Cookie made by an elytra scale and a cookie!
- Levitates the player for 3 seconds.
2019-08-30 01:12:02 +03:00
Sfiguz7
c11eb54037 Cleaning 2019-08-29 23:18:04 +02:00
Sfiguz7
7c6d722283 Cleaned constructors' diamond operators 2019-08-29 22:52:46 +02:00
Sfiguz7
85ee828abf Separated variable declaration 2019-08-29 22:46:03 +02:00
TheBusyBiscuit
ad5271e9a4 Fixes #1059 2019-08-29 22:27:46 +02:00
TheBusyBiscuit
63c3ddcd99
Merge pull request #1057 from LinoxGH/master
Adding Explosive Shovel and beautifying Tech Category.
2019-08-29 22:14:03 +02:00
Sfiguz7
f86e362e2f Bigger code cleaning 2019-08-29 22:04:31 +02:00
ajan-12
4b60ddf8e7 Fixing the placeholder method. 2019-08-29 22:24:52 +03:00
ajan-12
388ca2decd Renaming "Maximum Explosivity" to "Explosive Tools". 2019-08-29 22:24:19 +03:00
TheBusyBiscuit
cc034588f4
Merge pull request #1055 from Sfiguz7/master
Code cleaning
2019-08-29 20:35:58 +02:00
TheBusyBiscuit
37383169c1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-08-29 20:31:15 +02:00
TheBusyBiscuit
0868f47fc4 Fixed Smeltery Fire-Breaking chance not loading 2019-08-29 20:30:58 +02:00
Sfiguz7
c23b0e438b Code cleaning 2019-08-29 19:12:53 +02:00
ajan-12
f38323a2b4 Moved the Hologram Projector location for guide to look better. 2019-08-29 20:00:26 +03:00
ajan-12
ac7d1608e6 Adding Explosive Shovel.
- Renamed the Research "Explosive Pickaxe" to "Maximum Explosivity" and added Explosive Shovel to it.
- Added a new recipe to Magic Workbench for Explosive Shovel.
  - Explosive Shovel is made by 1 Ferrosilicon, 1 TNT and 1 Synthetic Diamond.
- Made the Explosive Shovel so that it can only break dirt-like, sand and its variations, gravel, clay and snow blocks.
  - This adds the shovel the benefit of fast landscaping but still adds a reason to use Explosive Pickaxe.
2019-08-29 19:36:16 +03:00
TheBusyBiscuit
b6b914f03e
Merge pull request #1054 from LinoxGH/master
Adding Auto Drier and optimizing imports for SlimefunSetup.java
2019-08-29 16:41:23 +02:00
LinoxGH
12fa69ac42
Changing the progress bar and removing redundant checks.
Implementing the changes requested in the PR to original Slimefun4 repo.
2019-08-29 17:30:30 +03:00
TheBusyBiscuit
bbf0bfd006 Refactoring 2019-08-29 16:19:23 +02:00
LinoxGH
6f09eaa1e4
Fixing the auto drier using multiple inputs. 2019-08-29 17:16:39 +03:00
LinoxGH
4e152ca180
Adding the file of the Auto Drier machine itself. 2019-08-29 16:56:18 +03:00
ajan-12
8188c1986c Adding a new electric machine Auto Drier.
- Made in Enhanced Crafting Table with 2 heating coils, 1 smoker and 1 campfire.
- Dries items.
  - Removes the water from water bucket.
  - Removes the liquids in potions.
  - Produces sticks from leaves and saplings.
  - Dries wet sponges to sponges.
  - Produces leathers from rotten flesh
2019-08-29 16:53:08 +03:00
TheBusyBiscuit
388873d6a2 Reduced technical debt 2019-08-29 15:13:40 +02:00
TheBusyBiscuit
ee30e8b73d Fixed StackOverflow 2019-08-29 13:59:33 +02:00
TheBusyBiscuit
405e2f651b Finalized #1053 2019-08-29 11:05:58 +02:00
TheBusyBiscuit
99cd14fa5f Added "legacy-ore-grinder" config option for old Ore Grinder Behaviour. 2019-08-29 10:26:36 +02:00
Sfiguz7
d6aff405ca Reduced technical debt 2019-08-28 23:47:25 +02:00
TheBusyBiscuit
e0316453d9 Reduced technical debt 2019-08-28 10:59:20 +02:00
TheBusyBiscuit
dc1cff31f5 Connected Interfaces to abstract classes 2019-08-28 00:48:39 +02:00
TheBusyBiscuit
1b3c0fcdc2 Fixed more stupid backwards compatibility 2019-08-28 00:43:18 +02:00
TheBusyBiscuit
9982292e80 Final fix 2019-08-28 00:09:23 +02:00
TheBusyBiscuit
33266c7c88 Fixed even more Issues 2019-08-27 23:48:41 +02:00
TheBusyBiscuit
2b09ca5e61 Stupid backwards compatibility 2019-08-27 23:24:43 +02:00
TheBusyBiscuit
4875ce1241 Revert "Removed deprecated junk"
This reverts commit cc3c026b1c.
2019-08-27 23:18:58 +02:00
TheBusyBiscuit
cc3c026b1c Removed deprecated junk 2019-08-27 23:14:10 +02:00
TheBusyBiscuit
3ccf0722b6 Reduced technical debt again 2019-08-27 23:08:13 +02:00
TheBusyBiscuit
204e61d3a5 Fixes #1049 again 2019-08-27 22:32:26 +02:00
TheBusyBiscuit
87ff5fdbc2 Pushing missing files 2019-08-27 21:46:50 +02:00
TheBusyBiscuit
31c7c50f64 Fixes #1049 2019-08-27 21:43:43 +02:00
TheBusyBiscuit
aff264d66c More Refactoring + Code Cleanup (Reduced cognitive load) 2019-08-27 20:37:33 +02:00
TheBusyBiscuit
3d3f1b6c87 Fixed Ignition Chamber Bug 2019-08-27 17:55:20 +02:00
TheBusyBiscuit
04444fc298 This File gets a Refactoring,
that File gets a Refactoring,
everybody gets a Refactoring!
2019-08-27 16:26:35 +02:00
TheBusyBiscuit
f4be2a8d5b Fixes #708 2019-08-27 15:35:56 +02:00
TheBusyBiscuit
77a8911b8c Another large wave of refactoring and technical debt reduction 2019-08-27 15:27:38 +02:00
TheBusyBiscuit
641a2e6e30 A LOT more Refactoring + Technical debt reduction 2019-08-27 14:08:09 +02:00
TheBusyBiscuit
fd36288efb More Refactoring 2019-08-27 13:28:07 +02:00
TheBusyBiscuit
65af683a8a Resolves #247 2019-08-27 13:09:30 +02:00
dNiym
07234cf246 Made requested changes. 2019-08-26 18:12:08 -04:00
dNiym
2b680ec88e Undid un-needed brackets {} 2019-08-26 18:08:08 -04:00
dNiym
33b09ef63d Fixes disabled items in worlds #735 2019-08-26 18:05:19 -04:00
TheBusyBiscuit
0ae0768c29 Fixes #1043 2019-08-26 22:01:40 +02:00
TheBusyBiscuit
7aff9a7fe4 Fixes #1042 2019-08-26 19:13:56 +02:00
TheBusyBiscuit
65975ae094 Refactored Code 2019-08-26 09:07:02 +02:00
TheBusyBiscuit
c08674d8c7 Fixes #1040 2019-08-26 09:04:25 +02:00
TheBusyBiscuit
effca277ba
Merge pull request #1039 from dniym/ElectricFurnace
Fix electric furnaces not being able to use logs.
2019-08-25 23:30:56 +02:00
dNiym
1859aef846 Fix electric furnaces not being able to use logs. 2019-08-25 17:24:51 -04:00
TheBusyBiscuit
9ac8fca7f4 Added Placeholders 2019-08-25 23:20:31 +02:00
TheBusyBiscuit
cbb1143456 Forgot to push this file 2019-08-25 23:14:06 +02:00
TheBusyBiscuit
ce3055a069 Fixed Infused Magnet working in Spectator Mode 2019-08-25 22:57:41 +02:00
TheBusyBiscuit
cdb43b15ee Added PlayerProfile#getTitle() 2019-08-25 22:39:59 +02:00
TheBusyBiscuit
8b55a4cd26 More Refactoring 2019-08-25 22:21:06 +02:00
TheBusyBiscuit
a1193781cb Reduced technical debt 2019-08-25 22:09:27 +02:00
TheBusyBiscuit
0925be3427 Deprecations 2019-08-25 22:01:22 +02:00
TheBusyBiscuit
d99c9ea584 First steps towards PlaceholderAPI hook 2019-08-25 21:41:47 +02:00
TheBusyBiscuit
79c1120ae8 Refactoring, Bug Fix and Cleanup 2019-08-25 20:52:38 +02:00
TheBusyBiscuit
f3c3552e9c Fixes #1036 2019-08-25 20:23:06 +02:00
TheBusyBiscuit
b10db8c728 Improved error-reports diagnostics 2019-08-25 18:06:36 +02:00
TheBusyBiscuit
2a3b446d15 Improved Backpacks Performance 2019-08-25 17:35:19 +02:00
TheBusyBiscuit
d589002430 Added Research-Caching (May improve Performance a lot) 2019-08-25 16:07:06 +02:00
TheBusyBiscuit
0fad51e263
Fixes #1034 2019-08-24 20:27:25 +02:00
dNiym
b82d9571b7 Fix busted spawners 2019-08-24 00:26:37 -04:00
TheBusyBiscuit
db1e69a94b Fixed Talisman of the Anvil (Fixes #800) 2019-08-23 21:15:47 +02:00
TheBusyBiscuit
6575e1c538
Merge pull request #1029 from dniym/SpawnerFix
Fix broken spawner error
2019-08-23 09:07:55 +02:00
dNiym
da8def9d4f Fix broken spawner error 2019-08-23 01:29:51 -04:00
TheBusyBiscuit
6de21b553b
Merge pull request #1026 from dniym/ReactorAccessFix3
Fixed Reactor Access Port being unable to be opened
2019-08-22 21:51:56 +02:00
TheBusyBiscuit
26efc7ad1e Fixes #1020 2019-08-22 21:37:09 +02:00