Commit Graph
868 Commits
Author SHA1 Message Date
gnembon b860f2b9b8 Merge branch 'master' into 1.16 2020-03-23 00:16:28 -03:00
gnembon 3adc628e8f added scarpet c_for loops 2020-03-23 00:10:50 -03:00
gnembon c7ea2c08f9 mapping 2020-03-22 23:35:01 -03:00
gnembon 52aab4a6cb Merge branch 'master' into 1.16 2020-03-22 23:33:39 -03:00
gnembon 9da1f087fd added entity API pose and fixed #180 2020-03-22 23:33:19 -03:00
gnembon 130ef80d30 mappings back to normal 2020-03-20 01:47:18 -03:00
gnembon e39d09cd89 Merge branch 'master' into 1.16 2020-03-18 22:02:45 -03:00
gnembon a31262fc71 1.3.15 2020-03-18 22:00:30 -03:00
gnembon 93806466a8 20w12a 2020-03-18 18:56:41 -03:00
gnembon 5efbbac663 left shears mining sponge. Only pickaxe and glass left 2020-03-18 16:21:10 -03:00
gnembon 1fcd8ceffa mappings 2020-03-18 02:34:03 -03:00
gnembon 583e023eb1 Merge branch 'master' into 1.16 2020-03-18 02:01:01 -03:00
gnembon 3f9556f9aa added legacy untracked npp lang specs 2020-03-18 00:47:30 -03:00
gnembon b041e05b47 removed inspector 2020-03-17 10:14:36 -03:00
gnembon 827299889d Merge branch 'master' into 1.16 2020-03-17 01:50:03 -03:00
gnembon d93a0dbdf4 moved scarpet docs to markdown files 2020-03-17 01:46:51 -03:00
gnembon efbafdcf0b Merge branch 'master' into 1.16 2020-03-15 23:26:44 -03:00
gnembon c7603038da fixed on_damage for all and on_death for multiplayer players. Fixes #177 2020-03-15 23:04:14 -03:00
gnembon 893122fe1f scarpet run() runs with scriptACE permissions. Fixes #175 2020-03-15 22:37:24 -03:00
gnembon 6351f28dfb mappings 2020-03-15 02:49:46 -03:00
gnembon cb52646695 Merge branch 'master' into 1.16 2020-03-15 02:41:35 -03:00
gnembon c0e72fe669 extra npe when world fails to load anyways. 2020-03-15 02:41:06 -03:00
gnembon 1ea7a30b81 added twisting vines to feature generator 2020-03-13 15:26:20 -03:00
gnembon a09ab80b4e 20w11a 2020-03-11 15:39:28 -03:00
gnembon f4d846c1c9 Merge branch 'master' into 1.16 2020-03-11 02:41:12 -03:00
gnembon 493cea2c13 added commandScriptACE setting and custom permissions for scarpet. 2020-03-11 02:39:39 -03:00
gnembon 06781bb62e Merge branch 'master' into 1.16 2020-03-11 01:00:33 -03:00
gnembon 8f32354606 removed particles that has already been removed in vanilla 2020-03-11 01:00:08 -03:00
gnembon b50e6772ce Merge branch 'master' into 1.16 2020-03-11 00:18:48 -03:00
gnembon e61549ae10 be more considerate to other modders 2020-03-11 00:17:42 -03:00
gnembon 286913ebd7 mapping update, fixed missing target mixins 2020-03-11 00:01:59 -03:00
gnembon b9964c8da8 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/utils/PerimeterDiagnostics.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-03-10 22:57:48 -03:00
gnembon a366e63987 verbump 1.3.14 2020-03-10 22:52:55 -03:00
gnembon 37e94e5978 weird flex but ok. Pathfinding affected spawning 2020-03-10 13:13:09 -03:00
gnembon fcd86537e6 weird flex but ok. Pathfinding affected spawning 2020-03-10 13:10:03 -03:00
gnembon 3a0a8325e1 mappings 2020-03-07 20:29:05 -04:00
gnembon c30cf5e4ff Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-03-07 14:11:33 -04:00
gnembon 926b1f20b9 NPE in event handling 2020-03-07 14:10:40 -04:00
gnembon 3dda2ed561 boi, 20w10a 2020-03-04 17:53:03 -04:00
gnembon f7a2b8202b boi, 20w10a 2020-03-04 17:43:26 -04:00
gnembon 6b36ac642b Merge branch 'master' into 1.16 2020-03-04 14:48:47 -04:00
gnembon fd0976de56 retiring blockpos 2020-03-04 14:48:29 -04:00
gnembon f28ae1aa70 Merge branch 'master' into 1.16 2020-03-04 13:17:57 -04:00
gnembon 7a611c53fc 1.3.13 2020-03-04 13:16:54 -04:00
gnembon 0cdd974068 Merge branch 'master' into 1.16 2020-03-04 05:35:56 -04:00
gnembon 8e2d0a0469 priority 2020-03-04 05:26:05 -04:00
gnembon aabb181b89 Merge branch 'master' into 1.16 2020-03-04 04:55:23 -04:00
gnembon 49250c8ad4 WIP with explosions 2020-03-04 04:54:57 -04:00
gnembon 878e406c20 Merge branch 'master' into 1.16 2020-03-04 00:50:24 -04:00
gnembon 1d3bfc8221 attempt to fix compat with overwriting of classes by other mods 2020-03-04 00:35:54 -04:00