Commit Graph
3610 Commits
Author SHA1 Message Date
Marc Hannappel 3d2097eb27 Fix for shulker dispenser behaviour
Fixes the behaviour of dispensers to remove 2 shulker boxes from a stack instead of 1
2019-06-06 18:47:16 +02:00
Auri 7e5375d476 initial pass at rsturbo 2019-06-06 15:55:19 +03:00
DeadlyMC bb517f082c persistentParrots 2019-06-06 17:41:40 +05:30
gnembon fd6c5c5787 Merge pull request #29 from DeadlyMC/desert_shrus
Completed desertShrubs port
2019-06-06 08:14:13 -03:00
gnembon 2d7e0cbb3d Merge pull request #27 from DeadlyMC/renewableSponges
Completed renewableSponges port
2019-06-06 08:08:24 -03:00
DeadlyMC a8598ad700 desertShrubs 2019-06-06 16:26:24 +05:30
DeadlyMC db6e619849 resolve merge conflicts 2019-06-06 16:12:34 +05:30
DeadlyMC 9e5981a3b9 Merge remote-tracking branch 'upstream/master' into renewableSponges 2019-06-06 16:11:06 +05:30
gnembon 653ddcf5f3 Merge pull request #26 from DeadlyMC/movableBlockEntities
Added movableTE mixins
2019-06-05 23:27:46 -03:00
gnembon 7e9b7e394b !true 2019-06-05 23:26:38 -03:00
gnembon 80c3494f23 1.13.2 used CM postfix for NBTs
just to avoid potential name collisions in case Mojang decides suddenly to add that tag and name it the same.
2019-06-05 22:46:33 -03:00
DeadlyMC 75f68c8bbe changed spawn type 2019-06-05 15:59:17 +05:30
DeadlyMC 6008c8e4a5 added renewableSponges mixins 2019-06-05 15:52:17 +05:30
DeadlyMC e409ae4108 added movableTE's with help from @2No2Name 2019-06-05 10:02:22 +05:30
gnembon 78eafdcedd Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-06-04 19:44:25 -03:00
gnembon bba6e900ea updated docs to mention loading from scripts files 2019-06-04 19:44:09 -03:00
gnembon 22d14d4ba7 Merge pull request #25 from DeadlyMC/patch
Fix block placement directions
2019-06-04 13:30:31 -03:00
DeadlyMC bac024eac5 Fix block placement directions 2019-06-04 21:40:13 +05:30
gnembon c04b18b158 update to 1.14.3 pre1 2019-06-04 10:21:21 -03:00
gnembon 137e0db6c9 f3 hud menu defaults to fabric and disabled profiler for spawning and chunks due to fabric bug on servers 2019-06-04 10:13:03 -03:00
gnembon 5faa8754fb 1.14.3 pre 1 2019-06-03 22:37:12 -03:00
gnembon b5454a8285 added pillager outposts 2019-06-03 08:55:49 -03:00
gnembon ac72f471be Merge pull request #23 from DeadlyMC/placement_rotation
Added placementRotationFix mixins
2019-06-02 14:46:43 -03:00
DeadlyMC 4dad60a664 refactored IEntity.java 2019-06-02 22:58:18 +05:30
DeadlyMC a018f2a2ae fix merge conflicts 2019-06-02 22:53:33 +05:30
DeadlyMC d0a1ac6b9a Merge branch 'master' into placement_rotation 2019-06-02 22:52:52 +05:30
gnembon a939e034a5 Merge pull request #24 from gnembon/events_schedules
schedules and events from jarmod
2019-06-02 01:56:01 -03:00
gnembon 730446b219 schedules and events from jarmod 2019-06-02 01:54:22 -03:00
DeadlyMC db091d68d7 added placementRotationFix mixins 2019-06-01 21:07:58 +05:30
gnembon 4ec6e0e03e 1.14.2 2019-05-27 13:00:43 -03:00
gnembon ae07252533 fix 2019-05-25 12:15:11 -03:00
gnembon 7800daacb8 added command source to rule validators and added WIP tag 2019-05-24 22:27:35 -03:00
gnembon acfa91d1e8 changed version to v19_05_25 2019-05-24 16:20:51 -03:00
gnembon c59ba3c10e 1.14.2 pre 4 2019-05-24 16:09:54 -03:00
gnembon b331f82adb vanilla cat spawning bug 2019-05-24 13:25:57 -03:00
gnembon fef36783d6 1.14.2 pre 3 2019-05-24 12:21:53 -03:00
gnembon 8c8682d2ca Merge pull request #19 from gnembon/plop
plop village
2019-05-24 11:50:09 -03:00
gnembon 57e17df632 plop village 2019-05-24 11:49:13 -03:00
gnembon 6ca4a73b4a Merge pull request #18 from gnembon/plop
plop
2019-05-23 16:01:41 -03:00
gnembon e3c0edae3c plop 2019-05-23 15:59:43 -03:00
gnembon b257e6f984 other features 2019-05-22 15:21:07 -03:00
gnembon 39727cb524 Merge pull request #17 from gnembon/loggers
loggers
2019-05-21 00:06:35 -03:00
gnembon 8b0b5412c4 loggers 2019-05-20 23:16:44 -03:00
gnembon db39f39553 Merge pull request #16 from gnembon/scarpet-homeandplop
home and plop fail
2019-05-20 22:21:00 -03:00
gnembon 3a0d01633c home and plop fail 2019-05-20 16:17:22 -03:00
gnembon 7d9418016a Merge pull request #15 from gnembon/addons
missing stuff
2019-05-19 12:21:21 -03:00
gnembon 24e70ba9ed missing stuff from quickcarpet 2019-05-19 12:20:35 -03:00
gnembon c4276b2bd4 Merge pull request #14 from gnembon/spawn
Spawn
2019-05-19 09:49:49 -03:00
gnembon 78739b3a2c consistency 2019-05-19 09:47:55 -03:00
gnembon a4d97b1875 empty 2019-05-19 02:20:30 -03:00