Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity
259 Commits 13 Branches 10 Tags
fb0fb08ca9d86f5a6158830ea358045ba61b0a67
Commit Graph

259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bradd evans
cf9ddb81d4 update ci build 2019-12-20 17:15:16 +00:00
braddevans
51703b3300 fix travis.yml build 2019-12-20 17:10:51 +00:00
bradd evans
5c9567e797 update campfire to the latest 1.14.4 version on craftbukkit 
update pom.xml to use a repo with almost every single lib you would ever need since nallar has been down for a year
update maven command to fully skip tests propperly
update work/paper
 2019-12-20 16:58:56 +00:00
braddevans
e75ae756d7 fix compile from fresh git clone 
fix compile
 2019-12-20 14:52:18 +00:00
Mgazul
d1569d7502 Merge pull request #101 from LegacyGamerHD/patch-2 
fix circleci and travis starting
 2019-11-29 13:42:29 +08:00
LegacyGamerHD
e39a36bd42 Update .travis.yml 2019-11-22 23:41:07 -08:00
LegacyGamerHD
f726349f27 fix travis 2019-11-22 23:31:25 -08:00
LegacyGamerHD
f13789ac6a fix circleci 2019-11-22 23:29:23 -08:00
Mgazul
80713fe0ac api 2019-11-22 23:06:18 +08:00
Mgazul
e24a0066a3 1.14.4 2019-11-22 22:45:47 +08:00
Mgazul
c08e6988a0 add Paper-1.14.4 2019-11-22 20:24:58 +08:00
Mgazul
e08e69fba1 Delete .gitmodules 2019-11-22 20:19:05 +08:00
Mgazul
e7bd70d7cf Delete Paper 2019-11-22 20:15:38 +08:00
dependabot[bot]
dc96116b8e Bump netty-all from 4.1.35.Final-SNAPSHOT to 4.1.42.Final 
Bumps [netty-all](https://github.com/netty/netty) from 4.1.35.Final-SNAPSHOT to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/commits/netty-4.1.42.Final)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-02 10:06:16 +00:00
Sotr
9c4d9da107 [CI-SKIP] Add Patreon 2019-05-14 16:37:24 +08:00
Sotr
d153994a97 Oops - remove debug 2019-05-14 13:03:35 +08:00
Sotr
6e5df77560 Spinning tick await 2019-05-14 13:02:49 +08:00
Sotr
99be334597 Do not reference server on api - ci stuff 2019-05-09 22:01:48 +08:00
Sotr
d8ed5e7ff5 Fixes logging error - GH-89 2019-05-05 14:01:02 +08:00
Sotr
2215a2da9f Optimize and make scoreboard safer - GH-87 2019-05-03 16:53:03 +08:00
Sotr
0231984357 Method conflict fixes #85 2019-04-26 04:41:53 +08:00
Sotr
2db912a9fd Fix up PS & memory leak 2019-04-25 02:35:19 +08:00
Sotr
3db7f6990a Brings getPlayer() and getWorld() to events 2019-04-22 20:03:09 +08:00
Sotr
16801d98a0 Overhaul Village API 
@Cushaw_BlueMelon
- Add @Nullable
- Double won't be null, so a @NotNull is no need
- Format codes
- Add missing village API (Should not use implementation codes on API!)
- Brings the API to world and entity
 2019-04-22 14:27:48 +08:00
Sotr
64238d53a4 Merge branch 'master' of github.com:Akarin-project/Akarin 2019-04-22 13:46:31 +08:00
Sotr
d446be1a3b Fixes c&v issue on macOS 2019-04-22 13:46:06 +08:00