Commit Graph
78 Commits
Author SHA1 Message Date
gnembon 273e324150 Licensing as MIT
Upon the agreement of all current carpet contributors
2020-06-20 08:44:54 -03:00
gnembonandGhoulboy78 29a81d53d6 unix_time and convert_date (#332)
* very simple stuff

* added unix_date and imporved unix_time

* Update docs/scarpet/api/Auxiliary.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>

* Update Full.md

* Dont 100% work, but It'll do untl I fix tomorrow

* works, I think

* changeing weekdays

* removing weird stuff I didnt mean to do

* previous commits

* moving to expression.java

because prof.gnembon said

* moving away from LazyFUnctions

cos gnembon doesn't like evaluating somewhere

* updating docs

* tweaks to dates

Co-authored-by: Ghoulboy78 <ghoulboy27@gmail.com>
2020-06-17 11:10:59 -03:00
gnembon 1aa237379e Merge pull request #241 from Ghoulboy78/modfy
added gamemode and jumping modifications
2020-04-29 10:36:48 -03:00
gnembon d1ccfcfe18 Merge pull request #232 from Ghoulboy78/diamond-draw
Added wacky shapes to draw command
2020-04-27 22:54:26 -03:00
gnembon 30e33c9d65 Merge pull request #250 from Ghoulboy78/category
Allow to query mob category
2020-04-25 16:24:20 -04:00
gnembon 4f6ebb4927 Update src/main/java/carpet/script/value/EntityValue.java
Added locale
2020-04-25 16:23:59 -04:00
gnembon 3c25110b50 Merge pull request #213 from X-Green/master
More infomation in TNT logging
2020-04-14 09:31:55 -03:00
gnembon 0133ceb507 Merge pull request #207 from Stypox/patch-2
Add newline at end of markdown documentation file
2020-04-12 01:10:10 -03:00
gnembon ba9bb11f3f fix docs 2020-03-28 13:15:27 -03:00
gnembon 819c8b18e2 Merge pull request #188 from Ghoulboy78/patch-5
place and objective are the other way around in scarpet as opposed to the documentation
2020-03-28 13:14:46 -03:00
gnembon 3e7915f294 Merge pull request #187 from Ghoulboy78/patch-2
u forgot to add scoreboard manip to documentation.md
2020-03-28 13:14:32 -03:00
gnembon 56d681560a Merge pull request #148 from technoabyss/patch-1
Add short explanation & example features to README
2020-02-21 09:01:54 -04:00
gnembon 80c6e0a13c moved list of settings to the wiki 2020-02-08 18:44:45 -04:00
gnembon 13a8fbb6f2 Merge pull request #142 from ImUrX/betterNetherDelays
make the nether portal delays better, fixes #139
2020-02-08 18:12:57 -04:00
gnembon 9598782a6f Merge pull request #132 from indoorjetpacks/patch-1
Changing filter() function example
2020-01-25 15:07:16 -04:00
gnembon bbb1ed4d35 Merge pull request #130 from gnembon/modules
Modules
2020-01-08 23:57:01 -04:00
gnembon c568a3d258 Merge pull request #125 from G4me4u/master
Added a way to ensure tickrate compatibility with other mods.
2020-01-02 19:45:32 -04:00
gnembon 8a4ad0f353 Merge pull request #115 from gnembon/threads
Threads
2019-12-25 03:12:26 -04:00
gnembon bf11cb7967 Merge pull request #103 from gnembon/proper_functions
Proper functions
2019-11-18 01:16:22 -04:00
gnembon 65a2ae263c Merge pull request #101 from DeadlyMC/patch
Fix ctrlQCrafting and autoCrafting duplicating items
2019-11-09 12:48:24 -04:00
gnembon 2348104a65 Merge pull request #96 from Earthcomputer/tnt_rules
Ported TNT rules
2019-10-23 08:45:36 -03:00
gnembon 4549c9948c Merge pull request #92 from DeadlyMC/patch-1
Add flatWorldStructureSpawning to feature list
2019-10-15 12:37:08 -03:00
gnembon 2e7e98669f Merge pull request #90 from DeadlyMC/flatworlds
Flat worlds structure spawning
2019-10-11 12:51:50 -03:00
gnembon c6b2551031 Merge pull request #89 from DeadlyMC/patch-1
Missing @Final
2019-10-08 09:07:24 -03:00
gnembon 2e8d7232a4 Merge pull request #87 from gnembon/scarpet_cleanup
Scarpet cleanup
2019-10-08 02:03:54 -03:00
gnembon 7373d085c7 Merge pull request #80 from 2No2Name/1.15
Updated MovableBlockEntity Rendering Code
2019-09-18 20:17:35 -03:00
gnembon 6d3376ca7a Merge pull request #78 from DeadlyMC/java9_compat
Java9 Compat
2019-09-15 13:20:11 -03:00
gnembon ba464bd79e Merge pull request #72 from 2No2Name/master
Made doublechests stick together when moved by a piston
2019-08-24 01:16:21 +02:00
gnembon a7addf7948 Merge pull request #70 from DeadlyMC/fabric_update
Update fabric and its dependencies
2019-08-08 08:00:11 -03:00
gnembon b1e52d59cf Merge pull request #60 from gnembon/villager_observer
Villager observer & gbfix
2019-07-28 12:33:32 -03:00
gnembon aac4563268 Merge pull request #58 from gnembon/post_release_teaks
Post release teaks
2019-07-26 15:44:07 -03:00
gnembon 2ba811bf48 Merge pull request #57 from gnembon/scarpet_fixes
Scarpet fixes
2019-07-21 16:59:08 -03:00
gnembon 6b24d7e93f Merge pull request #56 from gnembon/tracing_functions
Tracing functions
2019-07-20 19:15:22 -03:00
gnembon 19f910ba6b Merge pull request #54 from gnembon/player_actions
player actions
2019-07-17 01:00:28 -03:00
gnembon 488b3b7f8f Merge pull request #53 from gnembon/player_controller
Not a player controller
2019-07-15 12:51:51 -03:00
gnembon 10e0e68ddd Merge pull request #50 from gnembon/missing_features
Missing features
2019-07-08 00:54:49 -03:00
gnembon 95c7998af6 Merge pull request #47 from gnembon/better_extensions
rule management and extensibility
2019-07-04 02:00:11 -03:00
gnembon b56eb7403b Merge pull request #46 from gnembon/comments
pretty
2019-07-03 22:28:27 -03:00
gnembon 4e37d1a0d8 Merge pull request #45 from gnembon/comments
Comments
2019-07-03 22:10:45 -03:00
gnembon 0b6732fa93 Merge pull request #44 from gnembon/fast_redstone
Fast redstone
2019-07-03 13:02:05 -03:00
gnembon 558f1bc344 Merge pull request #43 from gnembon/inventory
touchups and docs
2019-07-02 09:09:25 -03:00
gnembon 79965dbc33 Merge pull request #42 from gnembon/inventory
Inventory in scarpet, primarily
2019-06-30 00:54:39 -03:00
gnembon 6c4ffd8e98 Merge pull request #40 from gnembon/settings_refactor_mark2
lazy rule fetching
2019-06-28 20:30:54 -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 9a0bcc80ea Merge pull request #37 from gnembon/markers
Markers and 1.14.3 pre 4
2019-06-19 18:40:01 -03:00
gnembon 17dae4dfdf Merge pull request #36 from DeadlyMC/husk
Completed huskSpawningInTemples port
2019-06-13 13:22:34 -03:00
gnembon 27fc57dbf6 Merge pull request #35 from gnembon/settings
Settings - should help with future expansions
2019-06-12 01:30:08 -03:00
gnembon e3838d466d Merge pull request #34 from gnembon/portals
portal caching, ignored item not creating portals issue on purpose
2019-06-10 08:39:42 -03:00
gnembon c84210429d Merge pull request #32 from gnembon/cactus
cactus and block rotator
2019-06-08 10:17:12 -03:00
gnembon a5d83a0c53 Merge pull request #30 from DeadlyMC/parrots
Completed persistentParrots port
2019-06-07 09:24:57 -03:00
gnembon 3e6168e74d Merge pull request #31 from Salandora/fixShulkerDispension
Fix for shulker dispenser behaviour
2019-06-06 22:58:52 -03:00
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
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
gnembon 22d14d4ba7 Merge pull request #25 from DeadlyMC/patch
Fix block placement directions
2019-06-04 13:30:31 -03:00
gnembon ac72f471be Merge pull request #23 from DeadlyMC/placement_rotation
Added placementRotationFix mixins
2019-06-02 14:46:43 -03:00
gnembon a939e034a5 Merge pull request #24 from gnembon/events_schedules
schedules and events from jarmod
2019-06-02 01:56:01 -03:00
gnembon 8c8682d2ca Merge pull request #19 from gnembon/plop
plop village
2019-05-24 11:50:09 -03:00
gnembon 6ca4a73b4a Merge pull request #18 from gnembon/plop
plop
2019-05-23 16:01:41 -03:00
gnembon 39727cb524 Merge pull request #17 from gnembon/loggers
loggers
2019-05-21 00:06:35 -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 7d9418016a Merge pull request #15 from gnembon/addons
missing stuff
2019-05-19 12:21:21 -03:00
gnembon c4276b2bd4 Merge pull request #14 from gnembon/spawn
Spawn
2019-05-19 09:49:49 -03:00
gnembon d970f7e4dd Merge pull request #12 from gnembon/fill
Fill
2019-05-18 21:13:18 -03:00
gnembon c495699c5c Merge pull request #13 from gnembon/perimeterinfo
perimeter
2019-05-18 15:09:28 -03:00
gnembon 9813ab3b71 Merge pull request #11 from DeadlyMC/explosion
Added explosionNoBlockDamage mixins
2019-05-18 14:39:40 -03:00
gnembon 83d834de60 Merge pull request #10 from DeadlyMC/tnt
Added TNTDoNotUpdate mixins
2019-05-18 10:51:15 -03:00
gnembon 16dbf17af0 Merge pull request #9 from gnembon/tickProfiler
Tick profiler
2019-05-18 02:16:40 -03:00
gnembon 94a3ad4704 Merge pull request #8 from gnembon/ctrqcrafting
ctrlQCraftingFix
2019-05-17 12:28:10 -03:00
gnembon c0b4e40e6f Merge pull request #5 from Salandora/StackableShulkerboxes
Empty stackable shulker boxes
2019-05-17 00:22:40 -03:00
gnembon 48ff85293f Merge pull request #7 from gnembon/scarpet
imports
2019-05-16 23:10:22 -03:00
gnembon 9e5c74dba9 Merge pull request #6 from gnembon/scarpet
scarpet v1.2
2019-05-16 23:07:26 -03:00
gnembon 723f863d98 Merge pull request #4 from DeadlyMC/packets
Ported /log packets
2019-05-15 01:01:59 -03:00
gnembon e6a3d478ec Merge pull request #3 from DeadlyMC/block_rotator_java
Ported BlockRotator.java
2019-05-14 11:40:40 -03:00
gnembon 0d43ba72c5 Merge pull request #2 from gnembon/basic_systems
Basic systems
2019-05-12 17:51:02 -03:00
gnembon a649a8fdb1 Initial commit 2019-05-09 23:54:11 -03:00