Commit Graph
778 Commits
Author SHA1 Message Date
gnembon 2e7e98669f Merge pull request #90 from DeadlyMC/flatworlds
Flat worlds structure spawning
2019-10-11 12:51:50 -03:00
DeadlyMC a8936c9efe added nether and end mobs 2019-10-11 20:31:02 +05:30
DeadlyMC 0957bb9b0c forgot to add desert temple spawns 2019-10-11 20:19:36 +05:30
gnembon a84b06306a . operator as lvalue 2019-10-11 11:11:54 -03:00
DeadlyMC 8ec1288079 flatWorldStructureSpawning 2019-10-11 18:28:37 +05:30
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -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
gnembon 3b6c1d045e seems to be working fine, but trees and other decorations received massive bureaucratic payload 2019-10-10 01:46:44 -03:00
gnembon dee3363a0d fixed refmap issues 2019-10-10 00:27:33 -03:00
gnembon 49d682e858 Merge branch 'master' into 1.15 2019-10-09 21:48:48 -03:00
gnembon 50298225d8 fixed description 2019-10-09 21:46:56 -03:00
gnembon 155c62d3fc renamed and changed block based on the final mojang proposal 2019-10-10 00:33:25 -03:00
gnembon 3e6363ae12 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-09 21:37:27 -03:00
gnembon ec0be058ac 41a complete 2019-10-10 00:28:49 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 5ebfb7d1c0 Merge branch 'master' into 1.15 2019-10-09 09:04:45 -03:00
gnembon 84aee6b593 1.1.2 2019-10-09 09:04:29 -03:00
gnembon 3ccfe38b75 should have gone with offset at the first place 2019-10-09 09:00:06 -03:00
gnembon 5a67d3223e Merge branch 'master' into 1.15 2019-10-09 08:58:39 -03:00
gnembon 83d91ede4f naming 2019-10-09 08:55:13 -03:00
gnembon 55f6503807 just sayin 2019-10-09 08:54:08 -03:00
gnembon c9a6d2ef96 slime is honey 2 2019-10-09 08:52:52 -03:00
gnembon 7ba4ff6647 slime is honey 1 2019-10-09 08:48:45 -03:00
gnembon 35a215038f Merge branch 'master' into 1.15 2019-10-09 00:44:07 -03:00
gnembon 5b1cb6aaf9 fixed wrong call 2019-10-09 00:39:16 -03:00
gnembon 3f1fd42c4e Merge branch 'master' into 1.15 2019-10-08 09:19:42 -03:00
gnembon 6f774e5727 added dev version to debug ref-map issues to be published to maven 2019-10-08 09:19:22 -03:00
gnembon c62625df66 Merge branch 'master' into 1.15 2019-10-08 09:10:55 -03:00
DeadlyMC 8be494fed0 missing @Final 2019-10-08 10:51:49 +05:30
gnembon 03703fd7fe 1.15 adjustments for scarpet 1.5 2019-10-08 02:18:09 -03:00
gnembon dc9532cf05 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-08 02:07:45 -03:00
gnembon ef757aec1d docs contd 2019-10-08 01:52:53 -03:00
gnembon daea1c7aa8 extended list put support 2019-10-08 01:59:12 -03:00
gnembon c442a78e49 docs 2019-10-07 16:50:36 -03:00
gnembon 768c44cc14 equality issues and docs 2019-10-07 09:30:25 -03:00
gnembon 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon dab9c5debe cleanup and added requirement for floats to start with 0.2 2019-10-05 02:23:53 -03:00
gnembon 974aa51e2a nbt done 2019-10-05 02:03:16 -03:00
gnembon a83fe72bbb Merge branch 'master' into scarpet_cleanup 2019-10-04 23:00:01 -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 06b25e9183 Merge branch 'scarpet_cleanup' of https://github.com/gnembon/fabric-carpet into scarpet_cleanup 2019-10-04 10:37:35 -03:00
gnembon d5cb86549d Merge branch 'master' into scarpet_cleanup 2019-10-02 19:53:33 -03:00
gnembon 8d29f95155 oups 2019-10-02 16:21:34 -03:00
gnembon 4fc8f112e9 one more battle won in the parrot war 2019-10-02 16:20:50 -03:00
gnembon 6f156f9fc2 19w40a 2019-10-02 16:17:07 -03:00
gnembon 412b33fee2 Merge branch 'master' into 1.15 2019-10-02 14:29:40 -03:00
gnembon 62f4a4c113 ver 1.1.1 2019-10-02 14:29:14 -03:00