TheBusyBiscuit
d91d9c2856
Removed Automated Crafting Chamber
2021-04-25 19:49:17 +02:00
TheBusyBiscuit
bffef56407
Added Category#setTier()
2021-04-25 19:47:58 +02:00
TheBusyBiscuit
c975fe234e
Fixed #2989
2021-04-25 19:29:57 +02:00
TheBusyBiscuit
8dce87cca0
[CI skip] Updated changelog
2021-04-24 13:40:19 +02:00
Daniel Walsh
2f27ddc6a6
Merge pull request #2988 from martinbrom/fix/talisman-of-the-anvil
...
Fixes NPE when hand is empty while talisman of the anvil triggers
2021-04-24 12:22:59 +01:00
TheBusyBiscuit
3fe7752e28
[CI skip] Merge pull request #2986 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
...
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.3
2021-04-24 12:47:16 +02:00
Martin Brom
a6f3696719
Fixes NPE when hand is empty while talisman of the anvil triggers
...
Resolves #2987
2021-04-24 12:22:40 +02:00
Renovate Bot
f7e5aa33b3
Update dependency com.github.LoneDev6:itemsadder-api to v2.3.3
2021-04-23 22:01:22 +00:00
TheBusyBiscuit
d0a7ad7aea
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-23 20:48:29 +02:00
TheBusyBiscuit
1c5372d261
Complete restructure of language files
2021-04-23 20:48:24 +02:00
TheBusyBiscuit
fb4c9a2a40
[CI skip] Merge pull request #2984 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.196
2021-04-23 20:45:31 +02:00
Renovate Bot
e323903a36
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.196
2021-04-23 18:39:42 +00:00
TheBusyBiscuit
3ad981aa1e
Fixed shading of libraries
2021-04-23 19:29:01 +02:00
TheBusyBiscuit
1982ec0aeb
Reorganized language files
2021-04-23 19:22:25 +02:00
TheBusyBiscuit
34421d4a12
More refactoring
2021-04-23 19:01:41 +02:00
TheBusyBiscuit
a3a9ee4b90
Various code improvements
2021-04-23 18:58:35 +02:00
TheBusyBiscuit
8aeda66c5e
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/AbstractSmeltery.java
2021-04-23 18:30:12 +02:00
TheBusyBiscuit
f017088f42
[CI skip] Small docs changes
2021-04-23 18:29:55 +02:00
Martin Brom
a94926dfaf
Small Auto-Enchanter cleanup
2021-04-23 17:12:26 +02:00
Martin Brom
cfb9f53057
Auto-Enchanter now checks both combinations of book and item in its inventory
...
Fixes #2977
2021-04-23 17:03:02 +02:00
TheBusyBiscuit
3da276f982
[CI skip] Yeah that didn't work out well...
2021-04-23 16:07:45 +02:00
TheBusyBiscuit
fed7d0ee43
Update Crowdin configuration file
2021-04-23 16:02:34 +02:00
Rothes
31a571455c
Update AbstractEnchantmentMachine.java
2021-04-23 20:08:40 +08:00
Rothes
67c0947dc8
Added toggle setting and some edit.
2021-04-23 20:04:00 +08:00
TheBusyBiscuit
02ba30c226
Updated changelog to include new features
...
Tier 2 Auto-Enchanter, Tier 2 Auto-Disenchanter
2021-04-23 13:51:42 +02:00
Daniel Walsh
b0f2fc8c4d
Merge pull request #2967 from variananora/add-suggestion-311
2021-04-23 12:50:41 +01:00
TheBusyBiscuit
c2ec4693ac
Merge pull request #2963 from martinbrom/feature/coalblock-carbon
...
Add Block of Coal -> Carbon recipe to the Carbon Press and Compressor
2021-04-23 13:46:22 +02:00
TheBusyBiscuit
a18a095722
[CI skip] Updated changelog
2021-04-23 13:46:16 +02:00
TheBusyBiscuit
9733dcf93a
[CI skip] Merge pull request #2980 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
...
Update ibiqlik/action-yamllint action to v3.0.1
2021-04-23 13:34:52 +02:00
BuildTools
a846d4ea1b
Re-added check null and empty.
2021-04-23 19:29:36 +08:00
Renovate Bot
e7f7e67530
Update ibiqlik/action-yamllint action to v3.0.1
2021-04-23 11:14:03 +00:00
Varian Anora
45d6c376af
Update researches_en.yml
2021-04-22 20:14:52 +07:00
Varian Anora
23d4aad256
Merge branch 'master' into add-suggestion-311
2021-04-22 20:12:47 +07:00
Daniel Walsh
9e5162179f
[CI Skip] Merge pull request #2970 from IAmSorryArt/protected
2021-04-22 11:03:03 +01:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-22 17:33:27 +08:00
Varian Anora
7fab4a8881
Merge branch 'master' into add-suggestion-311
2021-04-22 12:36:01 +07:00
Varian Anora
6840efe2f1
Changed Auto Disenchanter recipe and added new research for tier two enchanters.
...
Changed Auto Disenchanter Recipe to:
```
Auto Disenchanter II
Speed: 3x
Power: 48J/s
Buffer: 1024J
Recipe:
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Blistering Ingot (100%)
D = Auto Disenchanter
E = Wither Proof Obsidian
F = Big Capacitor```
Changed wither proof obsidian with big capacitor for the buffer size.
Added new research for tier two enchanters with 48 exp levels on ID 277.
2021-04-22 12:30:58 +07:00
Rothes
16a5a2ce06
Update
2021-04-22 11:58:52 +08:00
Varian Anora
9dec7b710d
Merge branch 'master' into add-suggestion-311
2021-04-22 10:39:45 +07:00
BuildTools
76f5848e08
Use ItemName in default value instead of Identifier
2021-04-21 22:34:17 +08:00
BuildTools
d28a97f729
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
2021-04-21 18:03:34 +08:00
Rothes
ecb23fa5e5
Update
2021-04-21 18:02:14 +08:00
Rothes
1777965964
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
...
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-04-21 17:56:39 +08:00
TheBusyBiscuit
371a8b5f52
Restored pom.xml
2021-04-21 11:50:37 +02:00
TheBusyBiscuit
6141bb9fd5
Merge branch 'master' of https://github.com/Slimefun/Slimefun4
2021-04-21 11:49:09 +02:00
Rothes
b729e14ec4
Update pom.xml
2021-04-21 17:46:13 +08:00
Rothes
f12b2a0ba7
Update pom.xml
2021-04-21 17:44:52 +08:00
Rothes
de927099e4
Update
2021-04-21 17:37:38 +08:00
TheBusyBiscuit
28137be764
[CI skip] Merge pull request #2975 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
...
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5
2021-04-21 10:17:25 +02:00
TheBusyBiscuit
0e9f420371
[CI skip] Merge pull request #2976 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x
...
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5
2021-04-21 10:17:05 +02:00
