Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.17.1 #33

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+670 −546
Open

1.17.1 #33

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
60f7b6e
v1.6.0 - 1.17 & Java 16
Diet-Cola Jun 30, 2021
b2c5120
POM fix
Diet-Cola Jun 30, 2021
294c3a5
Fix commands + protocol lib
Diet-Cola Jul 1, 2021
45814ea
Latest CMC
Diet-Cola Jul 5, 2021
0c34e60
Fix packethandler?
Diet-Cola Jul 6, 2021
dd6ff09
Revert "Fix packethandler?"
Diet-Cola Jul 6, 2021
76a5a4d
Update CTP
Diet-Cola Jul 13, 2021
e69795d
Knockback update and fix PL async exception
jaymsDooku Jul 17, 2021
360b6ac
Merge branch '16+17' into Diet-Cola/16+17
Diet-Cola Jul 18, 2021
d842fbb
Update version
Diet-Cola Jul 18, 2021
5ea7e2e
Merge remote-tracking branch 'origin/master' into 16+17
Diet-Cola Nov 2, 2021
b7a1a5c
Merge remote-tracking branch 'origin/master' into 16+17
Diet-Cola Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Latest CMC
@Diet-Cola
Diet-Cola committed Jul 5, 2021
commit 45814ea6468a7f1483f8b8e60589bbb9816f3c1d
3 changes: 1 addition & 2 deletions src/main/java/com/github/maxopoly/finale/ConfigParser.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.github.maxopoly.finale;


import static vg.civcraft.mc.civmodcore.utilities.ConfigParsing.parseTime;
import static vg.civcraft.mc.civmodcore.config.ConfigHelper.parseTime;


import com.github.maxopoly.finale.combat.CombatConfig;