icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,127 Commits 1 Branch 0 Tags
44101ddd3d60f640a4608a9bcb66dd60dc9c2035
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gnembon 7029c6b9b9 Merge pull request #722 from fxmorin/master 
Added Rule `lightningKillsDrops`
 2021-02-18 22:17:37 -04:00
gnembon b61d69c904 Update src/main/java/carpet/CarpetSettings.java 2021-02-18 22:15:59 -04:00
gnembon f9d9c01558 Merge pull request #720 from gnembon/fix_for_712 
Fix for 712
 2021-02-16 23:26:01 -04:00
gnembon c28aefa546 Merge pull request #679 from obp3ter/patch-1 
Typo correction
 2021-01-22 23:41:41 -04:00
gnembon 695b4a0e3a Merge pull request #682 from hqics/patch-1 
Missing 1 space
 2021-01-22 23:11:49 -04:00
gnembon 4694e40bdd Merge pull request #673 from altrisi/fix-split 
Fix split
 2021-01-14 23:57:28 -04:00
gnembon 0df16729db Merge pull request #675 from altrisi/1.17-nbtio-crash 
Fix NbtIo crash when loading appdata
 2021-01-14 23:56:29 -04:00
gnembon 2c7dd1c3b7 Merge pull request #650 from altrisi/release-action 
Add Publish Release Action
 2021-01-14 23:25:31 -04:00
gnembon d563e65c77 Merge pull request #666 from altrisi/extra-splitting 
[Suggestion] Allow splitting lists by element value
 2021-01-13 21:23:49 -04:00
gnembon 3bf3c31160 Merge pull request #668 from magneticflux-/fix-villager-mixin-signature 
Modify mixin signature to match 1.16 signature
 2021-01-13 01:53:40 -04:00
gnembon eac4eb0537 Merge pull request #634 from altrisi/freeze-schedules 
❄️ Freezing Scarpet ❄️
 2021-01-07 00:00:48 -04:00
gnembon e0a4a6e7f3 Merge pull request #658 from altrisi/json-tweaks 
JSON support tweaks
 2021-01-06 23:44:24 -04:00
gnembon 50294ac003 Merge pull request #659 from BisUmTo/patch-2 
Missing 'invulnerable' entity modifier in the Docs
 2021-01-06 23:43:33 -04:00
gnembon 35715c93aa Merge pull request #652 from altrisi/gradle-things 
Update Gradle and reintroduce automatic version in the JSON
 2021-01-01 10:19:58 -04:00
gnembon a0507400ee Merge pull request #631 from replaceitem/scoreboard-criterion-mod 
Added ability to change criterion with scoreboard_add Fixes #624
 2020-12-29 00:01:58 -04:00
gnembon 4aaec6562b Merge pull request #643 from altrisi/json-reading 
Reading/Writing JSON in Scarpet
 2020-12-28 22:48:55 -04:00
gnembon 2233dec197 Merge pull request #646 from Ghoulboy78/adding-game-data-version 
Add game_data_version to system_info
 2020-12-28 22:37:40 -04:00
gnembon 8aa2e93162 Merge pull request #628 from altrisi/formatted-add 
Add FormattedText addition
 2020-12-16 02:14:23 -04:00
gnembon fe611145a9 Merge pull request #623 from BisUmTo/onTrade-Scarpet-Event 
Added onTrade Scarpet Event
 2020-12-12 00:43:14 -04:00
gnembon 5e98fbef66 Update src/main/java/carpet/mixins/TradeOutputSlot_scarpetEventMixin.java 2020-12-12 00:42:03 -04:00
gnembon c5a23ad7e2 Merge pull request #609 from gnembon/module_imports 
better messaging on handling of unknown functions. fixes #606
 2020-12-04 23:22:02 -04:00
gnembon 1dd711a7e3 Merge pull request #601 from gnembon/rework_events 
rework of the event system, fixes #596
 2020-12-02 00:50:43 -04:00
gnembon b10280fd31 Merge pull request #590 from altrisi/global-apps 
Allow loading apps from a global path
 2020-11-29 18:17:07 -04:00
gnembon c19bed79de Merge pull request #565 from altrisi/extension-sync 
Sync extension's custom SettingsManager's rules
 2020-11-29 14:57:16 -04:00
gnembon 479333a70a Merge pull request #591 from altrisi/default-configs 
Add a way to load a default config file
 2020-11-29 13:26:23 -04:00
gnembon a0fc6b3af1 Merge pull request #526 from gnembon/custom_args 
custom args WIP
 2020-11-01 19:50:02 -04:00
gnembon 45b7da550f Merge pull request #523 from gnembon/entity_hooks 
Entity hooks and Event rework
 2020-10-31 14:37:37 -03:00
gnembon 45506d22f7 Merge pull request #524 from altrisi/patch-2 
[Actions] Only run mergedocs in master
 2020-10-31 11:42:08 -03:00
gnembon 33f8baf12d Merge pull request #514 from altrisi/flippinPillars 
Allow flippinCactus to rotate logs, hay bales and other pillars
 2020-10-27 22:27:14 -03:00
gnembon 801fb54bbd Merge pull request #508 from altrisi/patch-1 
[Actions] Fix and compatibility
 2020-10-26 23:42:30 -03:00
gnembon 1646187755 Merge pull request #511 from fezboy/master 
Add chain rotation to flippinCactus
 2020-10-26 21:43:57 -03:00
gnembon be98c0e2d5 Merge pull request #491 from TheCatSaber/patch-3 
Update Inventories.md
 2020-10-07 22:44:08 -03:00
gnembon d072d80df0 Merge pull request #484 from James103/patch-1 
Fixes gnembon/fabric-carpet#483
 2020-09-28 23:42:27 -03:00
gnembon 063a122a63 Update README.md 2020-09-18 00:46:11 -03:00
gnembon 755f3a7840 Update README.md 2020-09-11 09:37:29 -03:00
gnembon c69b781d33 Update README.md 2020-09-11 09:36:32 -03:00
gnembon 307ce57c0b Merge pull request #366 from hkva/master 
Allow "/player look" to target locations in the world with "/player look at"
 2020-07-06 00:22:52 -03:00
gnembon ed0090b134 Merge pull request #362 from eatmyvenom/1.16 
Add the rule bruteSpawningInBationRemnants
 2020-07-03 09:19:32 -03:00
gnembon 987f64b934 Merge pull request #360 from gnembon/light 
Light
 2020-07-01 01:43:08 -03:00
gnembon cd3057fa0c Merge pull request #359 from PhiPro95/light 
Rewrite regenerateChunkRegion
 2020-07-01 00:08:46 -03:00
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 de4c72b8b6 Merge pull request #227 from gnembon/revert-226-1.16 
Revert "Fixed Ticket #225"
 2020-04-15 23:51:13 -03:00
gnembon f47130a5fe Revert "Fixed Ticket #225" 2020-04-15 23:51:02 -03:00
gnembon 37af1d4cd6 Merge pull request #226 from SnaveSutit/1.16 
Fixed Ticket #225
 2020-04-15 23:49:17 -03: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