icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source
This commit is contained in:
gnembon committed 2019-12-30 01:00:42 -04:00
2 parents e3f6342e86 7a1fd2d900
commit 2880924491
3 files changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.7.2+build.175
# Mod Properties
mod_version = 1.3.2+v191227
mod_version = 1.3.2+v191230
maven_group = carpet
archives_base_name = fabric-carpet
src/main/java/carpet/CarpetSettings.java
+1 -1
View File
@@ -31,7 +31,7 @@ import static carpet.settings.RuleCategory.DISPENSER;
public class CarpetSettings
{
public static final String carpetVersion = "1.3.2+v191227";
public static final String carpetVersion = "1.3.2+v191230";
public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false;
src/main/resources/assets/carpet/scripts/camera.sc
+19 -19
View File
@@ -2,25 +2,25 @@ __command() ->
(
print('camera: scarpet app.');
print('-------------------');
print(' "/camera start" - set the starting point, resets the path');
print(' "/camera start" - Set the starting point, resetting the path');
print('');
print(' "/camera add <N>" - add point to the end <N> seconds later');
print(' "/camera prepend <N>" - prepend point <N> seconds before');
print(' "/camera clear" - removes entire path');
print(' "/camera select" - or punch a point, to select it');
print(' "/camera place_player - moves a player to a selected point');
print(' "/camera move" - moves selected point toplayer location');
print(' "/camera duration <X>" - resizes current selected path');
print(' "/camera split_point>" - splits current selected path in half');
print(' "/camera delete_point" - removes current keypoint');
print(' "/camera trim_path" - removes all keypoints from selected');
print(' "/camera add <N>" - Add a point to the end, <N> secs later');
print(' "/camera prepend <N>" - Prepend the start <N> secs before');
print(' "/camera clear" - Remove entire path');
print(' "/camera select" - .. a point or just punch it, to select it');
print(' "/camera place_player - Move player to the selected point');
print(' "/camera move" - Move the selected point to players location');
print(' "/camera duration <X>" - Set new selected path duration');
print(' "/camera split_point>" - Split selected path in half.');
print(' "/camera delete_point" - Remove current key point');
print(' "/camera trim_path" - Remove all key points from selected up');
print('');
print(' "/camera save_as <name>"');
print(' "/camera load <name>"');
print(' - stores and loads paths from files in /scripts folder');
print(' - Store and load paths from world saves /scripts folder');
print('');
print(' "/camera interpolation < linear | gauss | cr | gauss_<num> >"');
print(' Selects interpolation between points:');
print(' Select interpolation between points:');
print(' - cr: Catmull-Rom interpolation (default).');
print(' smooth path that goes through all points.');
print(' - linear: straight paths between points.');
@@ -35,20 +35,20 @@ __command() ->
print(' Repeat existing points configuration n-times');
print(' using <last_delay> seconds to link path ends');
print('');
print(' "/camera stretch <factor>" - ');
print(' Change number of frames between points');
print(' "/camera stretch <factor (in %)>" - ');
print(' Change length of the entire path');
print(' from 25 -> 4x faster, to 400 -> 4x slower,');
print('');
print(' "/camera transpose" - ');
print(' Move entire path with start at player position.');
print(' Move entire path with the start at players position.');
print('');
print(' "/camera play : run a path with a player');
print(' "/camera play : Run the path with the player');
print(' use "sneak" to stop it prematurely');
print(' run /camera hide and F1 to clear the view');
print('');
print(' "/camera show": shows current path');
print(' "/camera show": Show current path particles');
print(' color of particles used is different for different players');
print(' "/camera hide": hides path display');
print(' "/camera hide": Hide path display');
print('');
''
);