mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Code Releases Activity
1,355 Commits 1 Branch 0 Tags 64 MiB
2b89c41e3e
Commit Graph

327 Commits

Author SHA1 Message Date
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
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
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
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
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
3da4dce1f6 Fixes 2019-08-30 23:12:47 +02:00
Sfiguz7
e253f1dc43 Static non-final names compliance changes 2019-08-30 22:58:46 +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
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
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
TheBusyBiscuit
5ec7a27b2b Fixed Multiblocks 2019-08-30 20:41:39 +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
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
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
85ee828abf Separated variable declaration 2019-08-29 22:46:03 +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
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
TheBusyBiscuit
bbf0bfd006 Refactoring 2019-08-29 16:19:23 +02: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
99cd14fa5f Added "legacy-ore-grinder" config option for old Ore Grinder Behaviour. 2019-08-29 10:26:36 +02:00
TheBusyBiscuit
e0316453d9 Reduced technical debt 2019-08-28 10:59:20 +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
87ff5fdbc2 Pushing missing files 2019-08-27 21:46:50 +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
TheBusyBiscuit
c08674d8c7 Fixes #1040 2019-08-26 09:04:25 +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
dNiym
da8def9d4f Fix broken spawner error 2019-08-23 01:29:51 -04:00
NihilistBrew
ce1e3fb07c
Fix indents 2019-08-19 20:24:08 +02:00
NihilistBrew
4fd996e2fc Add double-chest backpack (Radiant Backpack) 2019-08-19 20:15:25 +02:00
TheBusyBiscuit
36377c5777
Merge pull request #1014 from dniym/TableSaw2 
Table Saw Bug #1003 fix
 2019-08-19 09:45:39 +02:00
dNiym
24e9652857 fix Item Duplication Bug #1003 
This fix currently prevents stripped_ logs from being used at all in the
table saw as the MaterialHelper.java in CS-Core lib needs to be updated
to allow the wood type to be properly detected from the material name.
Update submitted in cs-corelib ->
https://github.com/TheBusyBiscuit/CS-CoreLib/pull/109
 2019-08-19 00:18:09 -04:00
HSGamer
8a6cecf7bd SMELTERS_PICKAXE: return true 2019-08-04 21:26:27 +07:00
HSGamer
79e9839c6e SMELTERS_PICKAXE: use hasBlockInfo 2019-08-04 14:46:51 +07:00
HSGamer
e00984816f SMELTERS_PICKAXE: ignore Slimefun block 2019-08-04 08:44:05 +07:00
HSGamer
5746285881 EXPLOSIVE_PICKAXE: ignore liquid block 2019-08-04 08:38:58 +07:00
TheBusyBiscuit
80aecd2711
Merge pull request #989 from NihilistBrew/spawnerdupe 
Fix spawner dupe and objectified e.getBock()
 2019-08-03 20:33:41 +02:00
NihilistBrew
b6a4322de6
Fix PR: Remove block storage clear 2019-08-03 20:16:19 +02:00
TheBusyBiscuit
eec510d32f
Merge pull request #979 from dniym/TableSaw 
Table saw
 2019-08-03 20:06:05 +02:00
dNiym
e62a3d8509 Combined research for Table_Saw and Saw_Mill 2019-08-03 13:51:34 -04:00
dNiym
751cc88321 Re-Added SAW_MILL to research 2019-08-03 13:44:42 -04:00
TheBusyBiscuit
233c61e1d6
Merge pull request #990 from dniym/BioReactorFuelUpdate 
Adding new 1.14 materials to BioReactor
 2019-08-03 19:27:24 +02:00
dNiym
4d326f5228 Fixing revert, no idea how that happened. 2019-08-03 13:19:10 -04:00
dNiym
bcbeafba53 made requested changes 2019-08-03 13:05:23 -04:00
NihilistBrew
8af503aceb
Fix spawner dupe and objectified e.getBock() 2019-08-03 18:59:47 +02:00
TheBusyBiscuit
862c14c403
Merge branch 'master' into master 2019-08-03 18:08:51 +02:00
TheBusyBiscuit
9afba9fa78
Merge pull request #984 from NihilistBrew/changetowire 
Add copper wire
 2019-08-03 17:54:37 +02:00
NihilistBrew
460c082a51
Fixed research indent #2 2019-08-03 17:03:54 +02:00
NihilistBrew
5eaf3949b7
Fixed research indent 2019-08-03 17:02:32 +02:00
NihilistBrew
6af9307fe1 Accidentally edited a LOC 2019-08-02 15:04:22 +02:00
NihilistBrew
09b961ad1d Added sandstone to grind stone 2019-08-02 14:55:07 +02:00
NihilistBrew
78cea97fff Add copper wires 2019-08-02 13:20:28 +02:00
NihilistBrew
60064a0fe1 Added OUTPUT_CHEST functionality 
S
 2019-08-01 11:01:43 +02:00
dniym
1386849d7d
Replace Saw_Mill with Table_Saw machine 
Replaced saw_mill machine with new table_saw machine in the research, to allow players who previously unlocked the saw_mill to craft it's replacement.
 2019-07-30 12:53:03 -04:00