mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Code Releases Activity
6,439 Commits 1 Branch 0 Tags 64 MiB
23d4aad256
Commit Graph

6439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Varian Anora
9dec7b710d Merge branch 'master' into add-suggestion-311 2021-04-22 10:39:45 +07: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
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
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
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
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
TheBusyBiscuit
f91481db1c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 
Conflicts:
	CHANGELOG.md
 2021-04-17 09:51:24 +02:00