IAmSorry
b0a8ab55b9
Change visibility to protected 12
2021-04-19 17:20:13 +02:00
IAmSorry
a0b559330d
Change visibility to protected 11
2021-04-19 17:19:11 +02:00
IAmSorry
848725c42b
Change visibility to protected 10
2021-04-19 17:18:02 +02:00
IAmSorry
e7a92113d1
Change visibility to protected 9
2021-04-19 17:17:19 +02:00
IAmSorry
d1259888ce
Change visibility to protected 8
2021-04-19 17:15:36 +02:00
IAmSorry
54309e1f56
Change visibility to protected 7
2021-04-19 17:14:20 +02:00
IAmSorry
96715da55a
Change visibility to protected 6
2021-04-19 17:13:14 +02:00
IAmSorry
6de81be703
Change visibility to protected 5
2021-04-19 17:11:20 +02:00
IAmSorry
7efd07da10
Change visibility to protected 4
2021-04-19 17:08:56 +02:00
IAmSorry
c28ad40cf7
Change visibility to protected 3
2021-04-19 17:07:08 +02:00
IAmSorry
a222ec14dc
Changing the visibility to protected 2
2021-04-19 17:03:58 +02:00
IAmSorry
c574065470
Change visibility to protected
2021-04-19 17:02:19 +02:00
TheBusyBiscuit
dcc5648c8f
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-19 10:36:43 +02:00
TheBusyBiscuit
c1cb7d5213
[CI skip] Updated README and CHANGELOG
2021-04-19 10:36:25 +02:00
TheBusyBiscuit
61f128f828
[CI skip] Merge pull request #2969 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.194
2021-04-19 10:27:26 +02:00
Renovate Bot
da9d0467c5
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.194
2021-04-19 01:30:37 +00:00
Varian Anora
afc47f095c
Fix energy consumption on Auto Disenchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:21 +07:00
Varian Anora
4a949de996
Fix energy consumption on Auto Enchanter II
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-04-18 20:55:07 +07:00
Daniel Walsh
dc3b5bb7ff
Merge pull request #2965 from variananora/add-suggestion-#746
...
Add Quartz Block -> 4 Quartz to Grind Stone (Suggestion-746)
2021-04-18 14:45:35 +01:00
Varian Anora
37d7772f02
Add tier II machines to Auto Enchanter and Auto Disenchanter
...
Auto Enchanter II
Speed 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | F | E |
A = Reinforced Plate
B = Big Capasitor
C = Blistering Ingot (100%)
D = Auto Enchanter
E = Wither Proof Obsidian
F = Synthetic Diamond
Auto Disenchanter II
Speed: 3x
Power: 48J/s
| A | B | A |
| C | D | C |
| E | E | E |
A = Reinforced Plate
B = Anvil
C = Carbonado
D = Auto Enchanter II
E = Wither Proof Obsidian
2021-04-18 20:04:43 +07:00
TheBusyBiscuit
e59a5926c4
Code cleanup
2021-04-18 10:35:39 +02:00
TheBusyBiscuit
b20353557f
Photovoltaic Cells can no longer be placed
2021-04-18 10:11:32 +02:00
Varian Anora
473c58d720
Update GrindStone.java
2021-04-18 12:12:30 +07:00
Martin Brom
1c820196ef
Add Block of Coal -> Carbon recipe to the CarbonPress and Compressor
2021-04-17 14:41:24 +02:00
TheBusyBiscuit
f91481db1c
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
...
Conflicts:
CHANGELOG.md
2021-04-17 09:51:24 +02:00
TheBusyBiscuit
f3765ba7c7
Merge pull request #2956 from Slimefun/fix/2942
...
Fixes #2942
2021-04-17 09:46:35 +02:00
TheBusyBiscuit
2adedd2c76
[CI skip] Ffs, what is wrong with my keyboard
2021-04-17 09:45:22 +02:00
TheBusyBiscuit
34c3593e86
[CI skip] forgot one
2021-04-17 09:44:52 +02:00
TheBusyBiscuit
c6ad928a24
[CI skip] +1
2021-04-17 09:44:29 +02:00
Daniel Walsh
bf22f40f99
Oops forgot one validate
2021-04-17 08:39:56 +01:00
TheBusyBiscuit
b0c82c2395
[CI skip] Merge pull request #2962 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
2021-04-17 09:37:17 +02:00
Renovate Bot
50bc7525e0
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
2021-04-16 17:43:23 +00:00
TheBusyBiscuit
d2e17af2a1
Removed SlimefunBlockHandler
2021-04-16 15:05:39 +02:00
TheBusyBiscuit
c3028058c0
[CI skip] Updated changelog
2021-04-16 14:56:08 +02:00
TheBusyBiscuit
aa85388480
Renamed Solar Panel to Photovoltaic Cell
2021-04-16 14:55:49 +02:00
TheBusyBiscuit
23fa713b44
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
2021-04-16 14:50:21 +02:00
TheBusyBiscuit
cb3e9dfbeb
[CI skip] Refactoring
2021-04-16 14:50:06 +02:00
TheBusyBiscuit
deba144d6f
[CI skip] Merge pull request #2961 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
2021-04-16 14:14:59 +02:00
Renovate Bot
f547a7dad2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
2021-04-15 22:03:54 +00:00
Daniel Walsh
448d6ca565
Fix nullability - not sure why this wasnt flagged...
2021-04-15 12:23:02 +01:00
TheBusyBiscuit
fc6de18088
[CI skip] Merge pull request #2960 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
...
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190
2021-04-15 10:45:12 +02:00
Renovate Bot
cc6eac8d33
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190
2021-04-15 02:50:11 +00:00
Daniel Walsh
6c6acacd54
Changelog
2021-04-14 12:32:00 +01:00
Daniel Walsh
38a2246561
Fixes #2942
2021-04-14 12:15:55 +01:00
TheBusyBiscuit
dcc9e97509
[CI skip] Lock release date for RC-22
2021-04-13 19:22:34 +02:00
TheBusyBiscuit
53471f1177
[CI skip] Refactoring
2021-04-10 21:03:03 +02:00
TheBusyBiscuit
485dec746b
Merge pull request #2951 from Slimefun/api/auto-enchant-event
...
AutoEnchantEvent
2021-04-10 19:12:03 +02:00
Daniel Walsh
74333e9d40
Update changelog
2021-04-10 16:29:28 +01:00
Daniel Walsh
c8bf364e8f
no idea what you mean :eyes
2021-04-10 16:28:46 +01:00
TheBusyBiscuit
8be5673b7f
Merge pull request #2950 from md5sha256/feature/optimized-cargo
...
Optimizations to cargo
2021-04-10 17:20:21 +02:00
