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 |
|
TheBusyBiscuit
|
5c1dda32a4
|
[CI skip] Some unit test changes
|
2022-01-04 01:30:21 +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 |
|
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 |
|
TheBusyBiscuit
|
250fe4c901
|
Merge pull request #3367 from Slimefun/api/biome-maps
(API) Added Biome Maps [1.18 preparation]
|
2021-12-10 22:38:36 +01:00 |
|
TheBusyBiscuit
|
2296ae3aff
|
[CI skip] Merge pull request #3297 from svr333/WikiUpdate
Update wiki.json
|
2021-12-10 19:39:11 +01:00 |
|
TheBusyBiscuit
|
4daa5d6475
|
[CI skip] Merge pull request #3315 from TerslenK/master
Re-adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOC…
|
2021-12-10 19:01:38 +01:00 |
|
TheBusyBiscuit
|
224049431e
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/PatternUtils.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-12-10 18:57:28 +01:00 |
|
TheBusyBiscuit
|
50310fd2ce
|
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
|
2021-12-10 18:21:04 +01:00 |
|
TheBusyBiscuit
|
796193207e
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/biomes/BiomeDataConverter.java
Co-authored-by: Sfiguz7 <37039432+Sfiguz7@users.noreply.github.com>
|
2021-12-09 16:25:47 +01:00 |
|
TheBusyBiscuit
|
b58fff602e
|
Finished configuration
|
2021-12-09 15:28:10 +01:00 |
|
TheBusyBiscuit
|
6e60e94031
|
Updated Nether Ice biome map
|
2021-12-09 13:40:12 +01:00 |
|
TheBusyBiscuit
|
5ba049d29c
|
Added lenient parsing and more documentation
|
2021-12-09 12:42:02 +01:00 |
|
TheBusyBiscuit
|
db5e4ffa2e
|
Refactoring and documentation
|
2021-12-08 20:25:04 +01:00 |
|
TheBusyBiscuit
|
4136615c67
|
shhhh, this wasn't copy-pasted at all 👀
|
2021-12-08 18:44:36 +01:00 |
|
TheBusyBiscuit
|
4ba36a7dab
|
Added biome maps for existing resources
|
2021-12-08 18:36:53 +01:00 |
|
TheBusyBiscuit
|
074571ac22
|
Added more unit tests
|
2021-12-08 18:30:10 +01:00 |
|
TheBusyBiscuit
|
b2e391e099
|
First steps towards biome maps
|
2021-12-08 18:08:18 +01:00 |
|
Alessio Colombo
|
4e7ae6c5b0
|
Made gps complexity compatible with negative y
|
2021-12-08 15:10:17 +01:00 |
|
Daniel Walsh
|
ab477b412f
|
Push my WIP changes
|
2021-12-01 13:08:08 +00:00 |
|
TheBusyBiscuit
|
1f3d0f5c20
|
Fixed #3336
(untested)
|
2021-11-30 22:11:46 +01:00 |
|
TheBusyBiscuit
|
bacaceb22f
|
Refactored Industrial Miner ore handling
|
2021-11-30 19:45:10 +01:00 |
|
Jeffrey Kosse
|
1ae54130ef
|
changed up the tag
|
2021-11-07 14:44:14 +01:00 |
|