svr333
|
7f8ef8be84
|
Minor tweaks
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2022-01-02 15:17:45 +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 |
|
Senne
|
ef8e84a350
|
Invert if statement
|
2022-01-01 22:48:16 +01:00 |
|
Senne
|
4792124224
|
Refactor MiddleClickListener
|
2022-01-01 22:46:11 +01: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 |
|
Jeffrey Kosse
|
9d3ef19a24
|
updated pressure plate tag
|
2021-11-07 14:23:27 +01:00 |
|
terslenk
|
caca7fc7b9
|
forgot to remove second anvil tag ;-;
|
2021-11-01 17:51:18 +03:00 |
|
terslenk
|
a9c371a1d0
|
forgot to remove second anvil tag ;-;
|
2021-11-01 17:48:28 +03:00 |
|
terslenk
|
78aa3074ec
|
fixed tags location
|
2021-11-01 17:41:29 +03:00 |
|
terslenk
|
fa09f17d16
|
fixed values
|
2021-11-01 17:32:45 +03:00 |
|
terslenk
|
bcd0094652
|
removed tabs
|
2021-11-01 17:28:13 +03:00 |
|
TerslenK
|
88a496a0f1
|
Merge branch 'Slimefun:master' into master
|
2021-11-01 16:36:43 +03:00 |
|
TerslenK
|
62f43bfca6
|
Update src/main/resources/tags/gravity_affected_blocks.json
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
|
2021-11-01 16:34:33 +03:00 |
|
svr333
|
29585eb1a1
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2021-10-28 13:07:43 +02:00 |
|
svr333
|
0f176694a6
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-10-28 12:24:59 +02:00 |
|
Daniel Walsh
|
82978f7d5b
|
Merge pull request #3326 from guizhanss/fix/smithing-table-listener
|
2021-10-28 02:31:17 +01:00 |
|
Senne
|
4e92102a38
|
Fix typo
|
2021-10-23 15:18:46 +02:00 |
|
Senne
|
fc6805d943
|
Move to separate class
|
2021-10-23 15:17:12 +02:00 |
|
Senne
|
cd76f924d0
|
Make field static
|
2021-10-23 14:05:40 +02:00 |
|
ybw0014
|
4ea652960b
|
Fix smithing table listener on 1.15 and below
|
2021-10-22 07:22:57 +08:00 |
|
TheBusyBiscuit
|
a9c330d6a3
|
[CI skip] Fixed javadocs
|
2021-10-21 11:59:22 +02:00 |
|
Sfiguz7
|
b23a907053
|
Revert requested change as it breaks it :NotLikeThis:
|
2021-10-15 15:33:45 +02:00 |
|
Sfiguz7
|
0f7f48647b
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/Slimefun.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-10-15 15:30:46 +02:00 |
|
Alessio Colombo
|
f63502bf42
|
Updated changelog
|
2021-10-15 15:03:51 +02:00 |
|
Alessio Colombo
|
258f375357
|
Added toggle to data zip backup
|
2021-10-15 15:02:12 +02:00 |
|
Alessio Colombo
|
5f27e968b3
|
Removed unused recipe from GrindStone
|
2021-10-12 16:26:19 +02:00 |
|
Alessio Colombo
|
5817494b2a
|
Recipe fix
|
2021-10-12 16:19:29 +02:00 |
|
TheBusyBiscuit
|
008090cc6f
|
[CI skip] Added unit test for new debugging tool
|
2021-10-11 01:37:54 +02:00 |
|
TerslenK
|
8ba3e35f0e
|
Merge branch 'Slimefun:master' into master
|
2021-10-10 23:32:46 +03:00 |
|
TheBusyBiscuit
|
5883a84158
|
Merge branch 'master' into feature/debug-command
|
2021-10-10 19:45:40 +02:00 |
|
Daniel Walsh
|
9d222ec49c
|
peepoPog wow
|
2021-10-10 18:42:08 +01:00 |
|
TerslenK
|
2c2042de82
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-10-10 20:38:43 +03:00 |
|
Daniel Walsh
|
3f00777db3
|
Fix import
|
2021-10-10 18:29:01 +01:00 |
|
Daniel Walsh
|
cdf5142f8b
|
Improved message and removed tab completion
|
2021-10-10 17:58:09 +01:00 |
|
terslenk
|
7e3774ecd1
|
adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java
|
2021-10-10 14:32:54 +03:00 |
|
terslenk
|
75b298ed18
|
adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java
|
2021-10-10 14:20:35 +03:00 |
|
terslenk
|
af9c61904d
|
adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java
|
2021-10-10 14:06:49 +03:00 |
|
Daniel Walsh
|
c18ce123c0
|
Add "disable" to tab complete
|
2021-10-09 18:02:22 +01:00 |
|
Daniel Walsh
|
4444fc6ec2
|
Changes
|
2021-10-09 17:57:38 +01:00 |
|
TheBusyBiscuit
|
e42700dc98
|
Merge pull request #3307 from svr333/AdjustSolarGenerator
Solar Generators - Return night energy in non overworld dimensions
|
2021-10-09 18:08:11 +02:00 |
|
Daniel Walsh
|
cea2ec194f
|
Merge branch 'feature/debug-command' of github.com:Slimefun/Slimefun4 into feature/debug-command
|
2021-10-09 16:35:39 +01:00 |
|
Daniel Walsh
|
b3ee9628b5
|
Add perm to plugin.yml
|
2021-10-09 16:35:30 +01:00 |
|
Daniel Walsh
|
ccd4d5bf65
|
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
|
2021-10-09 16:19:30 +01:00 |
|
Senne
|
b0544ee79b
|
Add as setting
|
2021-10-09 16:09:25 +02:00 |
|
Senne
|
42e647020f
|
Remove redundant line
|
2021-10-09 12:42:56 +02:00 |
|
Daniel Walsh
|
ecc0d6bb69
|
Added some comments
|
2021-10-09 10:13:27 +01:00 |
|
Daniel Walsh
|
1d27adabd4
|
Missing author tags
|
2021-10-09 10:06:05 +01:00 |
|
Daniel Walsh
|
b2590ddd42
|
Lots of docs and stuff
|
2021-10-09 10:05:09 +01:00 |
|
TheBusyBiscuit
|
9c3465e80f
|
Merge pull request #3298 from qwertyuioplkjhgfd/shift-lumber-axe
Check for sneaking when breaking logs on lumber axe
|
2021-10-08 19:32:40 +02:00 |
|
Daniel Walsh
|
421545111e
|
da hecl
|
2021-10-07 19:20:01 +01:00 |
|
Daniel Walsh
|
fd148f9d8e
|
Another log
|
2021-10-07 19:14:08 +01:00 |
|
Daniel Walsh
|
f0d4b57a47
|
Fix bug
|
2021-10-07 19:12:16 +01:00 |
|
Senne
|
4cff65ed16
|
Resolve conflicts
|
2021-10-07 17:26:05 +02:00 |
|
Senne
|
bdf2a1b8a1
|
Clean up if
|
2021-10-07 17:25:20 +02:00 |
|
svr333
|
eb790b232b
|
rename blockData to blockId
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
|
2021-10-07 17:19:24 +02:00 |
|
Senne
|
c882154860
|
Typos
|
2021-10-07 15:22:14 +02:00 |
|
Senne
|
02b0411d57
|
Clone item
|
2021-10-07 15:21:33 +02:00 |
|
Senne
|
6978bdfe0d
|
Implement feature
|
2021-10-07 15:11:42 +02:00 |
|
Daniel Walsh
|
3284604160
|
Implement the ability for debug logging
|
2021-10-07 13:51:31 +01:00 |
|
Senne
|
0937391220
|
Initial tryout
|
2021-10-06 23:24:33 +02:00 |
|
Sfiguz7
|
73a59014cc
|
Restored and removed the correct comments
|
2021-10-06 22:57:23 +02:00 |
|