mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
1,267 Commits 1 Branch 0 Tags 64 MiB
af40186418
Commit Graph

981 Commits

Author SHA1 Message Date
ajan-12
d5a8bade3e Code cleanup and doing the requested changes. 2019-09-01 12:38:43 +03:00
TheBusyBiscuit
ed1bf015b7 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-08-31 20:34:28 +02:00
TheBusyBiscuit
8be6f9cebb Hotfix 2019-08-31 20:34:10 +02: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
TheBusyBiscuit
10f3dae550 Fixed Color Character in Elevator Floor names 2019-08-31 20:09:25 +02:00
Sfiguz7
08cdd595ba Removed unnecessary array creations 2019-08-31 19:45:39 +02:00
TheBusyBiscuit
edeef7c14d Logger Conversion Pt.5 2019-08-31 17:52:20 +02:00
TheBusyBiscuit
2f5177b785 Refactored Code 2019-08-31 15:52:52 +02:00
TheBusyBiscuit
6eb3cee4a2 Reduced technical debt 2019-08-31 15:52:15 +02:00
TheBusyBiscuit
91f31d361a Logger Conversion Pt.4 2019-08-31 15:07:27 +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
01fd2cd38c Logger Conversion Pt.2 2019-08-31 12:54:54 +02:00
TheBusyBiscuit
c293605312 Logger Conversion Pt.1 2019-08-31 12:12:38 +02:00
TheBusyBiscuit
e78e749e94 Insanely huge Refactoring 2019-08-31 11:36:45 +02:00
TheBusyBiscuit
b9be211b7f
Merge pull request #1070 from Sfiguz7/master 
Conditional structures dupe codes cleaning
 2019-08-31 09:39:48 +02:00
LinoxGH
4c30764dac
Improved the Storm Staff recipe a bit. 2019-08-31 02:15:41 +03:00
LinoxGH
cc4a678750
Fixed bugs about Storm Staff. 
- Changed "1 Uses left" to "1 Use left".
- Fixed the recipe.
- Fixed durability not working.
- Fixed a server crash when item breaks.
 2019-08-31 02:13:56 +03:00
Sfiguz7
4fe72148a2 Conditional structures dupe codes cleaning 2019-08-30 23:57:30 +02:00
TheBusyBiscuit
fb0cd04b81 Refactored Network classes 2019-08-30 23:55:40 +02:00
TheBusyBiscuit
d8d7212a29
Merge branch 'master' into master 2019-08-30 23:23:12 +02:00
TheBusyBiscuit
9aa7845293 Refactored Code 2019-08-30 23:21:34 +02:00
Sfiguz7
d5f8fb465f Fixes#2 2019-08-30 23:21:33 +02:00
Sfiguz7
3da4dce1f6 Fixes 2019-08-30 23:12:47 +02:00
TheBusyBiscuit
24ec50e072 Removed even more empty methods 2019-08-30 23:11:37 +02:00
Sfiguz7
e253f1dc43 Static non-final names compliance changes 2019-08-30 22:58:46 +02:00
TheBusyBiscuit
43e6b5875c Made a constant out of this variable 2019-08-30 22:58:09 +02:00
TheBusyBiscuit
2940db51ad Refactoring 2019-08-30 22:56:44 +02:00
Sfiguz7
29a8d81345 Local variables name compliance changes 2019-08-30 22:49:18 +02:00
TheBusyBiscuit
591160a45f Removed more empty methods 2019-08-30 22:41:58 +02:00
LinoxGH
60977a01c6
Doing the requested changes. 2019-08-30 23:39:14 +03:00
TheBusyBiscuit
1615f5948d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-08-30 22:30:18 +02:00
TheBusyBiscuit
d14ef3891a Cleared another empty method 2019-08-30 22:30:03 +02:00
TheBusyBiscuit
1b27287f15
Merge pull request #1068 from Sfiguz7/master 
Removed empty methods
 2019-08-30 22:18:51 +02:00
TheBusyBiscuit
1de54daf5d Refactoring 2019-08-30 22:18:36 +02:00
Sfiguz7
a5eeb7c414 Removed empty methods 2019-08-30 22:05:49 +02:00
TheBusyBiscuit
dc1de711b0 Removed debug message 2019-08-30 21:51:37 +02:00
TheBusyBiscuit
f9bbfdc869 Changed Pressure Chamber and Table Saw Slabs 2019-08-30 21:48:11 +02:00
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