mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
7,495 Commits 1 Branch 0 Tags 64 MiB
b00286e607
Commit Graph

5418 Commits

Author SHA1 Message Date
FN-FAL113
b00286e607
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-31 18:12:56 +08:00
FN-FAL113
6cc4695e8c
Remove nested condition 2022-01-31 10:11:00 +08:00
FN-FAL113
45b4268871
Industrial miner fix 2022-01-31 09:16:17 +08:00
The Busy Bot
d38dd0d992
[CI skip] New locale updates from Crowdin 2022-01-20 19:29:28 +01:00
TheBusyBiscuit
dd16b7c84c [CI skip] Fixed javadocs 2022-01-18 20:03:52 +01:00
TheBusyBiscuit
e02eedd940
Merge pull request #3275 from Sfiguz7/fix/itemsadder_cargo_stacking 
Fixes #3133
 2022-01-18 17:52:08 +01:00
The Busy Bot
0a1724b63e
[CI skip] New locale updates from Crowdin 2022-01-18 13:31:11 +01:00
Daniel Walsh
220cfc9058
Update dough 2022-01-16 16:54:19 +00:00
TheBusyBiscuit
0a94854629
[CI skip] Merge pull request #3415 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x 
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5
 2022-01-16 15:13:00 +01:00
TheBusyBiscuit
eff4bf133d Fixed unit tests 2022-01-16 15:05:01 +01:00
TheBusyBiscuit
014f832347 Fixed #3429 2022-01-16 15:02:05 +01:00
TheBusyBiscuit
e8f2a5fc49 [CI skip] Uninitialized ItemSettings will now cause test failures 2022-01-16 14:57:27 +01:00
TheBusyBiscuit
c1074faeb2 Added PlayerProfile#hasUnlockedEverything() 
and also updated all workflows to JDK 17
 2022-01-16 14:17:50 +01:00
TheBusyBiscuit
6ec11e17ef
Merge pull request #3428 from J3fftw1/feature/VanillaTransformationIceInFreezer 
Added vanilla ratios to the freezer
 2022-01-15 22:49:24 +01:00
J3fftw
4f2900045a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2022-01-15 22:29:22 +01:00
J3fftw
5af5fbf973
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2022-01-15 18:48:22 +01:00
Jeffrey Kosse
fb3f76e9eb did requested changes 2022-01-15 18:40:39 +01:00
Jeffrey Kosse
155feede96 you are a dog 2022-01-15 18:10:56 +01:00
Jeffrey Kosse
2e94b101ae formatting where? 2022-01-15 18:09:05 +01:00
Jeffrey Kosse
e38a6bf80b formatting where? 2022-01-15 18:08:22 +01:00
Jeffrey Kosse
0d80b295ff fixed imports 2022-01-15 17:57:26 +01:00
Jeffrey Kosse
4aaa6db05f added vanilla transformation to ice 2022-01-15 17:56:18 +01:00
poma123
2bc0313b2a Added a new fromJson method with isLenient parameter 2022-01-15 17:19:50 +01:00
poma123
ecdf4f939c Made BiomeMapParser public 2022-01-14 12:13:21 +01:00
TheBusyBiscuit
5c1dda32a4 [CI skip] Some unit test changes 2022-01-04 01:30:21 +01:00
TheBusyBiscuit
eac32ac94c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2022-01-02 12:51:38 +01:00
TheBusyBiscuit
f2f3a6c719 Fixed unit test 2022-01-02 12:51:30 +01:00
TheBusyBiscuit
730f2676b3
Merge pull request #3401 from variananora/feature/add-fuel-to-bio-reactor 
Add fuel types to BioGenerator
 2022-01-02 12:48:06 +01:00
TheBusyBiscuit
3d87cb3df1 Fixed #3400 2022-01-02 12:47:22 +01:00
Varian Anora
9703016ae2 Added 1.17 items and blocks 2022-01-02 18:31:46 +07:00
Varian Anora
311d600095 Add fuel types to BioGenerator 2022-01-02 18:02:52 +07:00
TheBusyBiscuit
3993f48499 Some boring refactoring work 2022-01-01 14:34:36 +01:00
TheBusyBiscuit
0538e34578 Added Armored Jetpack recipe (resolves #1315) 2022-01-01 01:01:52 +01:00
TheBusyBiscuit
96aaa9de43 Fixed #3368 2022-01-01 00:57:13 +01:00
TheBusyBiscuit
8114729e16 Fixed #3390 2021-12-31 18:29:21 +01:00
qwertyuioplkjhgfd
330b5ff91d lol 2021-12-27 11:21:21 -08:00
Alessio Colombo
3c32194507 Fixed import order 2021-12-22 22:58:59 +01:00
Alessio Colombo
d96fa92957 Fixes #3385 2021-12-22 22:54:56 +01:00
Alessio Colombo
b46140202c Fixed android movement below y=0 2021-12-22 22:38:12 +01:00
TheBusyBiscuit
e755756dad
Merge pull request #3305 from Slimefun/feature/farmer_talisman 
Added Talisman of the Farmer (approved suggestion)
 2021-12-21 10:42:47 +01:00
TheBusyBiscuit
8229935b3a [CI skip] Fixed Unit Test 2021-12-21 10:32:39 +01:00
qwertyuioplkjhgfd
9723d6af80 this is probably unintended? 2021-12-20 23:30:56 -08:00
Alessio Colombo
8116820a53 Bleh 2021-12-20 14:04:16 +01:00
Alessio Colombo
2d526f30b4 Moved double drops to helper method 2021-12-20 13:37:01 +01:00
Daniel Walsh
77aa308a76
Oops 2021-12-18 18:13:40 +00:00
Daniel Walsh
6bfc2a1a40
Remove SF only method 2021-12-18 17:55:51 +00:00
Daniel Walsh
18665692b8
Improved the API for BiomeMap 2021-12-18 13:49:41 +00:00
TheBusyBiscuit
f0bf6f0d1d Encourage Java 17 (not required) 2021-12-17 17:57:21 +01:00
TheBusyBiscuit
2ab59393a6 Added 1.18 biome-maps 2021-12-10 23:03:17 +01:00
TheBusyBiscuit
93775e36b4 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
wip/1.18

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/OilResource.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/resources/SaltResource.java
	src/test/java/io/github/thebusybiscuit/slimefun4/api/geo/TestResourceRegistration.java
 2021-12-10 22:45:00 +01:00