 gnembon
|
c995716357
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/fakes/StructureFeatureInterface.java
# src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
|
2020-01-06 21:28:07 -04:00 |
|
|
gnembon
|
6ac249968a
|
remove a few warnings
|
2020-01-06 21:26:44 -04:00 |
|
|
gnembon
|
8022d88d28
|
WOOL
|
2019-12-28 18:00:28 -04:00 |
|
|
gnembon
|
762ddacdbd
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
# src/main/resources/carpet.mixins.json
|
2019-12-28 17:58:13 -04:00 |
|
|
gnembon
|
b2a72dbcd8
|
WOOL
|
2019-12-28 17:57:52 -04:00 |
|
|
gnembon
|
e9e36f64a3
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
# src/main/java/carpet/script/CarpetExpression.java
# src/main/resources/carpet.mixins.json
|
2019-12-27 11:26:49 -04:00 |
|
|
gnembon
|
d7ca974f1a
|
statistics, block placed and interacted events, stats event test
|
2019-12-27 03:25:56 -04:00 |
|
|
gnembon
|
bd5bd12e2a
|
Merge branch 'master' into 1.15
|
2019-11-29 10:34:36 -04:00 |
|
|
gnembon
|
afd7952a62
|
refactor entity events. Allow multiple hosts have events on things
|
2019-11-29 10:34:13 -04:00 |
|
|
gnembon
|
12408cac75
|
Merge branch 'master' into 1.15
|
2019-11-18 01:17:37 -04:00 |
|
|
gnembon
|
95b85928f9
|
refactored and reworked functions in scarpet
|
2019-11-18 00:56:50 -04:00 |
|
|
gnembon
|
24d4159f9f
|
Merge branch 'dummy_enchants' into 1.15
|
2019-11-07 07:58:32 -04: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
|
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 |
|
|
Joe
|
df2ea4d2cc
|
Add TNT rules
|
2019-10-23 04:53:34 +01:00 |
|
|
gnembon
|
7b649f9ccd
|
19w41a first pass
|
2019-10-09 19:43:37 -03:00 |
|
|
gnembon
|
f6db78c04f
|
Merge branch 'master' into 1.15
|
2019-09-22 17:02:40 -03:00 |
|
|
gnembon
|
6166eb3fbf
|
better pistons rotators
|
2019-09-22 17:02:21 -03:00 |
|
|
2No2Name
|
ef94e7c302
|
Updated MovableBlockEntity Rendering Code
|
2019-09-19 01:07:43 +02:00 |
|
|
gnembon
|
fa8bdc800e
|
Merge branch 'master' into 1.15
|
2019-09-16 22:01:38 -03:00 |
|
|
gnembon
|
fd3bcab522
|
fix
|
2019-09-16 22:01:06 -03:00 |
|
|
gnembon
|
addb836b21
|
19w36a
|
2019-09-05 09:09:46 -03:00 |
|
|
gnembon
|
2fcef289f0
|
Merge branch 'master' into 1.15
|
2019-09-04 22:06:05 -03:00 |
|
|
gnembon
|
06b3f7c532
|
more entity events and entity item api
|
2019-09-03 09:16:18 -03:00 |
|
|
gnembon
|
628a350ea1
|
19w35a
|
2019-08-28 20:23:32 -03:00 |
|
|
gnembon
|
6505afdfdb
|
better entity events, untested
|
2019-07-25 14:10:01 -03:00 |
|
|
gnembon
|
32dc6b17e8
|
entity events
|
2019-07-25 09:08:51 -03:00 |
|
|
gnembon
|
76334f9a68
|
missing tools and motd fixed
|
2019-07-06 02:22:00 -03:00 |
|
|
gnembon
|
4ebe292eab
|
Merge pull request #38 from aurieh/wip/rsturbo
initial pass at rsturbo
|
2019-06-25 15:49:27 -03:00 |
|
|
gnembon
|
64d507f70b
|
dummy enchantments
|
2019-06-20 17:13:15 -03:00 |
|
|
gnembon
|
c7739f1963
|
portal caching, ignored item not creating portals issue on purpose
|
2019-06-10 01:33:59 -03:00 |
|
|
Auri
|
7e5375d476
|
initial pass at rsturbo
|
2019-06-06 15:55:19 +03:00 |
|
|
DeadlyMC
|
e409ae4108
|
added movableTE's with help from @2No2Name
|
2019-06-05 10:02:22 +05:30 |
|
|
DeadlyMC
|
4dad60a664
|
refactored IEntity.java
|
2019-06-02 22:58:18 +05:30 |
|
|
gnembon
|
e3c0edae3c
|
plop
|
2019-05-23 15:59:43 -03:00 |
|
|
gnembon
|
b257e6f984
|
other features
|
2019-05-22 15:21:07 -03:00 |
|
|
gnembon
|
3a0d01633c
|
home and plop fail
|
2019-05-20 16:17:22 -03:00 |
|
|
gnembon
|
3330e6f922
|
rework motd and 14.2 pre 2
|
2019-05-18 00:45:36 -03:00 |
|
|
gnembon
|
885f579d6c
|
scarpet v1.2
|
2019-05-16 14:11:39 -03:00 |
|
|
gnembon
|
5109263fd8
|
Merge branch 'basic_systems'
# Conflicts:
# src/main/java/carpet/commands/SpawnCommand.java
# src/main/java/carpet/helpers/CtrlQCrafting.javax
# src/main/java/carpet/utils/HUDController.java
# src/main/java/carpet/utils/SpawnReporter.java
# src/main/resources/carpet.mixins.json
|
2019-05-13 01:51:36 -03:00 |
|
|
gnembon
|
5251bff2c7
|
moved rest of the stuff. mixins needed still
|
2019-05-13 01:48:00 -03:00 |
|
|
gnembon
|
f985678517
|
moved rest of the stuff. mixins needed still
|
2019-05-12 17:50:00 -03:00 |
|
|
gnembon
|
ecced620a4
|
moved a bunch of stuff
|
2019-05-12 01:48:19 -03:00 |
|