gnembon
|
8725b59241
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/commands/ScriptCommand.java
# src/main/java/carpet/helpers/EntityPlayerActionPack.java
|
2020-01-05 02:27:33 -04:00 |
|
gnembon
|
15fe9c5ad9
|
fixes #126
|
2020-01-03 16:45:35 -04:00 |
|
gnembon
|
ff8dc630c5
|
19w44a
|
2019-10-30 13:38:51 -03:00 |
|
gnembon
|
f0f3d4a60e
|
updated mappings
|
2019-10-11 08:43:19 -03:00 |
|
gnembon
|
7b649f9ccd
|
19w41a first pass
|
2019-10-09 19:43:37 -03:00 |
|
gnembon
|
b7548456ca
|
Merge branch 'master' into 1.15
|
2019-10-04 22:59:44 -03:00 |
|
gnembon
|
891cfbddde
|
fix errors and excepted axes from auto gb protection.
|
2019-10-04 22:57:52 -03:00 |
|
gnembon
|
59f2c8f958
|
19w38b WIP
|
2019-09-18 16:25:08 -03:00 |
|
gnembon
|
45b4bbcd99
|
Merge branch 'master' into 1.15
|
2019-09-16 00:35:36 -03:00 |
|
gnembon
|
368e76fbd7
|
fake players use items properlier
|
2019-09-15 17:42:31 -03:00 |
|
gnembon
|
e025aedda7
|
cleanup
|
2019-08-28 22:02:01 -03:00 |
|
gnembon
|
628a350ea1
|
19w35a
|
2019-08-28 20:23:32 -03:00 |
|
gnembon
|
50d1d74579
|
player actions
|
2019-07-17 03:58:16 -03:00 |
|
gnembon
|
734dc95dab
|
settings ported to the annotation based system
|
2019-06-11 23:01:09 -03:00 |
|
gnembon
|
f985678517
|
moved rest of the stuff. mixins needed still
|
2019-05-12 17:50:00 -03:00 |
|