Commit Graph

285 Commits

Author SHA1 Message Date
cakoyo
0822c65af8 Merge pull request #149 from tsao-chi-fork/tsao-chi-patch-1
fix url
2020-04-03 15:47:17 +07:00
ㄗㄠˋ ㄑㄧˊ
740e47df67 fix url 2020-04-03 16:18:50 +08:00
Joseph Robinson
4e6d4be087 Create SECURITY.md 2020-04-02 00:22:00 -07:00
Joseph Robinson
5aaa3815fd Merge pull request #125 from tsao-chi/patch-2
typo?
2020-04-01 10:54:48 -07:00
Joseph Robinson
3ffb622a36 Added spigot repo 2020-03-31 13:30:56 -07:00
Joseph Robinson
7f0d3d441c Update README.md - Linted 2020-03-29 10:41:25 -07:00
Joseph Robinson
818ec7912c Fixed distribution error 2020-03-29 10:28:19 -07:00
Joseph Robinson
8c4adc5eb5 Merge branch 'master' of https://github.com/Akarin-project/Akarin 2020-03-28 21:50:38 -07:00
Joseph Robinson
7be85efd51 Added gradlebuild.sh 2020-03-28 18:32:01 -07:00
Joseph Robinson
9313f9d557 Updated checksums? 2020-03-28 17:15:39 -07:00
Joseph Robinson
aeec043ef1 removed copy of build.sh 2020-03-28 17:15:27 -07:00
Joseph Robinson
86631090a7 updated gradle 2020-03-28 17:14:17 -07:00
ㄗㄠˋ ㄑㄧˊ
4c6947d949 typo? 2020-03-28 21:12:13 +08:00
Joseph Robinson
82d21e2156 Update README.md 2020-03-26 17:35:19 -07:00
Joseph Robinson
bd6a6a4af2 Update README.md 2020-03-26 17:29:29 -07:00
Joseph Robinson
f95d397ee1 Update README.md 2020-03-26 17:26:02 -07:00
Joseph Robinson
c47fa0e78c Merge pull request #121 from LegacyGamerHD/patch-5
update the link
2020-03-19 10:36:20 -07:00
LegacyGamerHD
a70eb4415c Update README.md 2020-03-19 18:35:47 +01:00
Joseph Robinson
21713af0a0 Update README.md 2020-03-19 10:33:39 -07:00
Joseph Robinson
5bb3faf096 Update README.md 2020-03-18 19:53:43 -07:00
Joseph Robinson
b8e12697cc Merge pull request #118 from tsao-chi/patch-1
Rebrand (fix #109)
2020-03-16 09:16:26 -07:00
ㄗㄠˋ ㄑㄧˊ
0917583727 net.minecraft.server.MinecraftServer: Rebrand 2020-03-16 16:27:28 +08:00
ㄗㄠˋ ㄑㄧˊ
74d7463012 org.bukkit.craftbukkit.CraftServer: Rebrand 2020-03-16 16:25:37 +08:00
Joseph Robinson
c50dd7660f updated gradle to 6.2.2 2020-03-06 22:04:16 -07:00
Joseph Robinson
2e6ed47fc3 Updated build.gradle 2020-03-06 22:02:37 -07:00
Joseph Robinson
ff11917fde Merge pull request #112 from Akarin-project/gradle
Gradle
2020-03-06 22:01:23 -07:00
Joseph Robinson
fb0fb08ca9 Merge pull request #116 from Akarin-project/master
Updated gradle branch with master
2020-03-06 22:01:08 -07:00
Joseph Robinson
d996e03194 Revert "Merge branch 'master' of https://github.com/Akarin-project/Akarin"
This reverts commit d21f1ae0f7.
2020-03-06 21:47:22 -07:00
Joseph Robinson
0fc67cb84b Revert "changes suggested by @liach"
This reverts commit d9c7c27de2.
2020-03-06 21:46:16 -07:00
Joseph Robinson
d9c7c27de2 changes suggested by @liach 2020-03-06 21:35:40 -07:00
Joseph Robinson
d21f1ae0f7 Merge branch 'master' of https://github.com/Akarin-project/Akarin 2020-03-06 21:32:41 -07:00
Joseph Robinson
cfedff9496 Merge pull request #115 from Akarin-project/master
Added new gitignore to gradle branch
2020-03-06 21:31:42 -07:00
Joseph Robinson
8ee8f1125a Merge pull request #113 from Akarin-project/gitignore-update
Update .gitignore
2020-03-06 21:30:08 -07:00
Joseph Robinson
77f5c39f45 Merge pull request #114 from josephworks/master
Updated Gradle to last ver of gradle 5
2020-03-06 14:23:56 -07:00
Joseph Robinson
dcda956eb9 Updated Gradle to last ver of gradle 5 2020-03-06 14:20:47 -07:00
Joseph Robinson
3eae763c37 Update .gitignore 2020-03-06 14:14:20 -07:00
Joseph Robinson
673af6e6ce Merge pull request #111 from josephworks/master
Added Gradle
2020-03-06 14:05:12 -07:00
Joseph Robinson
1773ae99c0 Added Gradle 2020-03-06 14:01:58 -07:00
Joseph Robinson
eedfeffb32 Merge branch 'master' of https://github.com/Akarin-project/Akarin 2020-03-01 13:22:16 -07:00
Joseph Robinson
9b0e0440fa double [] for scripts 2020-03-01 13:19:05 -07:00
Joseph Robinson
c462bfc444 Updated EULA.java 2020-03-01 13:18:10 -07:00
Joseph Robinson
a3e57ec664 Merge pull request #108 from josephworks/master
Update EULA.java
2020-03-01 13:15:44 -07:00
Joseph Robinson
f303f0429a Update EULA.java 2020-03-01 13:15:04 -07:00
Joseph Robinson
9001462a77 Updated donation text 2020-03-01 10:19:18 -07:00
cakoyo
603e6030f5 Merge pull request #105 from WhyDoWeWonder/hacky-build
Workaround to Make Akarin Build
2020-02-17 11:10:50 +07:00
WhyDoWeWonder
1a5e7ff422 Debugging code
Trying to get it to build properly, just some debugging code
2020-02-14 20:04:37 -05:00
WhyDoWeWonder
1e5930ff4f Workaround to Make Project Build
Quick and Dirty hacks to get Akarin to build on the rbuild server.
2020-02-14 19:30:45 -05:00
cakoyo
89d7ca75b2 Merge pull request #100 from Akarin-project/dependabot/maven/io.netty-netty-all-4.1.42.Final
Bump netty-all from 4.1.35.Final-SNAPSHOT to 4.1.42.Final
2020-02-01 06:05:17 +07:00
Mgazul
0c27784fc2 Merge pull request #102 from braddevans/patch-1
fix compile from fresh git clone
2019-12-21 07:26:52 +08:00
Mgazul
0f4d9dbcc6 Merge pull request #103 from braddevans/master
update campfire to the latest 1.14.4 version from craftbukkit
2019-12-21 07:26:29 +08:00