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
BuildTools
27bbca1502
Update
2021-04-21 13:06:16 +08:00
BuildTools
0a1345622e
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# 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 13:03:34 +08:00
BuildTools
8eb196caaa
a
2021-04-21 12:58:30 +08:00
Rothes
807c442930
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
...
Co-authored-by: Riley <69326411+Mooy1@users.noreply.github.com>
2021-04-21 12:20:08 +08:00
Renovate Bot
f3565a6556
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5
2021-04-21 04:08:29 +00:00
Renovate Bot
aa314d4e41
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5
2021-04-21 04:08:25 +00:00
TheBusyBiscuit
c0058a3994
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
2021-04-20 17:35:51 +02:00
Rothes
837afab0db
Update AutoEnchanter.java
2021-04-20 22:43:37 +08:00
Rothes
2b3658a724
Update AutoDisenchanter.java
2021-04-20 22:43:05 +08:00
Varian Anora
2803fbe61e
Merge branch 'master' into add-suggestion-311
2021-04-20 19:00:37 +07:00
TheBusyBiscuit
8181f04b22
[CI skip] Merge pull request #2973 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
...
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.1
2021-04-20 09:59:35 +02:00
Renovate Bot
98fa7c180a
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.1
2021-04-20 07:55:46 +00:00
TheBusyBiscuit
f72abde66a
[CI skip] Merge pull request #2971 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.195
2021-04-20 09:54:50 +02:00
Rothes
df0d36f4f7
Merge branch 'master' into master
2021-04-20 12:51:03 +08:00
Rothes
37bb6005e8
Improved code
2021-04-20 12:48:17 +08:00
Rothes
68dc6d560d
Improved code
2021-04-20 12:47:48 +08:00
Renovate Bot
1a53db1e14
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.195
2021-04-19 20:41:07 +00:00
IAmSorry
a16e1f6efc
Fixed the wrong protected :)
2021-04-19 22:30:07 +02:00
TheBusyBiscuit
57cb7e4cb3
[CI skip] Improved wording for PR checklist
2021-04-19 20:19:15 +02:00
TheBusyBiscuit
f0fae0c74a
[CI skip] That sounded a bit off.
2021-04-19 20:17:28 +02:00
TheBusyBiscuit
0fbb9b2d9b
[CI skip] 200+ contributors, we need a third page 👀
2021-04-19 20:15:56 +02:00
IAmSorry
04b901928c
Change visibility to protected 19
2021-04-19 17:30:12 +02:00
IAmSorry
357898fe8e
Change visibility to protected 18
2021-04-19 17:28:47 +02:00
IAmSorry
cc39df17ac
Change visibility to protected 17
2021-04-19 17:26:34 +02:00
IAmSorry
86e73631c7
Change visibility to protected 16
2021-04-19 17:25:09 +02:00
IAmSorry
ce86abca47
Change visibility to protected 15
2021-04-19 17:23:40 +02:00
IAmSorry
6d36b43ced
Change visibility to protected 14
2021-04-19 17:22:31 +02:00
IAmSorry
ecda25819b
Change visibility to protected 13
2021-04-19 17:21:07 +02:00
IAmSorry
b0a8ab55b9
Change visibility to protected 12
2021-04-19 17:20:13 +02:00
