 gnembon
|
8f9dd66cdf
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
# src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/FossilFeatureMixin.java
# src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
# src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
# src/main/java/carpet/mixins/KelpFeatureMixin.java
# src/main/java/carpet/mixins/MobEntity_leashMixin.java
# src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
# src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
# src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
# src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
# src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
# src/main/java/carpet/mixins/SaplingBlockMixin.java
# src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
# src/main/java/carpet/mixins/SpawnHelperMixin.java
# src/main/java/carpet/mixins/StructurePieceMixin.java
|
2019-12-10 23:14:04 -04:00 |
|
|
gnembon
|
8b1286f8af
|
fixed missed command registration for extension, 1.3.0, added optional version.
|
2019-12-10 23:01:30 -04:00 |
|
|
gnembon
|
442b802638
|
Merge branch 'master' into 1.15
|
2019-12-09 10:36:40 -04:00 |
|
|
gnembon
|
5b2d45f152
|
1.2.6 aka 1.3 pre-1
|
2019-12-09 10:34:32 -04:00 |
|
|
gnembon
|
04459094e6
|
1.15 mixin cleanup
|
2019-12-07 01:07:19 -04:00 |
|
|
gnembon
|
af153eb42d
|
Merge branch 'master' into 1.15
|
2019-11-30 01:26:08 -04:00 |
|
|
gnembon
|
4736c6b4fd
|
1.2.5 prep
|
2019-11-30 01:25:02 -04:00 |
|
|
gnembon
|
6e97401ebb
|
Merge branch 'master' into 1.15
|
2019-11-26 02:07:25 -04:00 |
|
|
gnembon
|
8b73d57a6b
|
chunk_tickets_api
|
2019-11-26 02:05:48 -04:00 |
|
|
gnembon
|
dbf48ea3bf
|
Merge branch 'master' into 1.15
|
2019-11-20 01:23:59 -04:00 |
|
|
gnembon
|
18edddcade
|
1.2.4
|
2019-11-20 01:18:32 -04:00 |
|
|
gnembon
|
122533a7e0
|
new loader
|
2019-11-20 01:05:39 -04:00 |
|
|
gnembon
|
3e93929bc7
|
new loader
|
2019-11-20 01:04:50 -04:00 |
|
|
gnembon
|
2e1cfdda5d
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-20 01:03:04 -04:00 |
|
|
gnembon
|
7ef2f9c8ca
|
new loader
|
2019-11-20 00:59:49 -04:00 |
|
|
gnembon
|
29fa86ca8a
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-13 14:03:52 -04:00 |
|
|
gnembon
|
12e6ef627f
|
1.2.3
|
2019-11-13 14:01:29 -04:00 |
|
|
gnembon
|
1861381951
|
oupsie
|
2019-11-10 20:49:31 -04:00 |
|
|
gnembon
|
6dd31329b7
|
Merge branch 'master' into 1.15
|
2019-11-07 14:29:26 -04:00 |
|
|
gnembon
|
c855955179
|
1.2.2
|
2019-11-07 14:27:25 -04:00 |
|
|
gnembon
|
24d4159f9f
|
Merge branch 'dummy_enchants' into 1.15
|
2019-11-07 07:58:32 -04:00 |
|
|
gnembon
|
99f6b4580d
|
Merge branch 'master' into 1.15
|
2019-10-30 13:24:03 -03:00 |
|
|
gnembon
|
e2c614c6de
|
ver 1.2.1
|
2019-10-30 13:18:41 -03:00 |
|
|
gnembon
|
fa3b119857
|
Merge branch 'master' into 1.15
|
2019-10-30 01:24:20 -03:00 |
|
|
gnembon
|
5bb959a853
|
falling blocks can also tick
|
2019-10-30 01:23:52 -03:00 |
|
|
gnembon
|
b1e2b4367d
|
Merge branch 'master' into 1.15
|
2019-10-28 21:55:49 -03:00 |
|
|
gnembon
|
9315bc09dd
|
simplified string parsing.
|
2019-10-28 21:55:27 -03:00 |
|
|
gnembon
|
ccbf6d85eb
|
Merge branch 'master' into 1.15
|
2019-10-25 01:09:53 -03:00 |
|
|
gnembon
|
bd52f6126a
|
hires logo
|
2019-10-25 00:39:15 -03:00 |
|
|
gnembon
|
f41ae0f00e
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/TntEntityMixin.java
# src/main/java/carpet/script/value/EntityValue.java
|
2019-10-23 08:58:57 -03:00 |
|
|
gnembon
|
1226a940e9
|
Merge branch 'master' of https://github.com/gnembon/fabric-carpet
|
2019-10-23 08:50:03 -03:00 |
|
|
gnembon
|
e21cbf5f59
|
remove markers when app unloads or not loaded
|
2019-10-23 08:49:58 -03:00 |
|
|
Joe
|
df2ea4d2cc
|
Add TNT rules
|
2019-10-23 04:53:34 +01:00 |
|
|
gnembon
|
631545767b
|
Merge branch 'master' into 1.15
|
2019-10-20 02:00:05 -03:00 |
|
|
gnembon
|
fd59b826c3
|
1.2
|
2019-10-20 01:52:48 -03:00 |
|
|
gnembon
|
bc9d0664cd
|
restored some anti cheat things for elytra, still applicable
|
2019-10-16 15:48:14 -03:00 |
|
|
gnembon
|
6018f680b4
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
|
2019-10-16 09:40:36 -03:00 |
|
|
gnembon
|
f0054564fe
|
1.1.3
|
2019-10-16 09:39:37 -03:00 |
|
|
gnembon
|
b99b2bd57e
|
Merge branch 'master' into 1.15
|
2019-10-16 08:58:28 -03:00 |
|
|
gnembon
|
e54a9ca5ca
|
sc fix
|
2019-10-16 01:36:09 -03:00 |
|
|
gnembon
|
7fae5c92cf
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/script/CarpetExpression.java
|
2019-10-13 02:55:19 -03:00 |
|
|
gnembon
|
8b531834d0
|
changed to ':'
|
2019-10-12 01:18:14 -03:00 |
|
|
gnembon
|
6a67407edf
|
. operator as lvalue
|
2019-10-11 13:39:29 -03:00 |
|
|
DeadlyMC
|
8ec1288079
|
flatWorldStructureSpawning
|
2019-10-11 18:28:37 +05:30 |
|
|
gnembon
|
dbf8dfb3c5
|
Merge branch 'master' into 1.15
|
2019-10-11 08:19:00 -03:00 |
|
|
gnembon
|
985b179cb2
|
adjusted camera to v1.5
|
2019-10-11 08:18:40 -03:00 |
|
|
gnembon
|
01b599b8e3
|
adjusted camera to v1.5
|
2019-10-11 03:03:03 -03:00 |
|
|
gnembon
|
f32a353655
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
# src/main/java/carpet/script/CarpetExpression.java
# src/main/java/carpet/script/bundled/BundledModule.java
# src/main/resources/assets/carpet/scripts/camera.sc
# src/main/resources/assets/carpet/scripts/event_test.sc
|
2019-10-11 02:28:15 -03:00 |
|
|
gnembon
|
fc66ec9c93
|
build in script load from resources, added 2 more events, added event test
|
2019-10-11 02:23:45 -03:00 |
|
|
gnembon
|
435794569e
|
build in script load from resources, fixed entity value position errors, added 2 more events, added event test
|
2019-10-11 01:47:04 -03:00 |
|