Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Upstream #8

Merged
merged 98 commits into from
Nov 13, 2019
Merged

Conversation

Wealthyturtle
Copy link
Owner

Description


Target Minecraft Versions:
Requirements:
Related Issues:

bensku and others added 29 commits November 4, 2019 16:38
* ExprPlayerWeather - fix
- Fix some issues with not properly setting/resetting player's weather

* ExprPlayerWeather - change
- Change suggested by Blueyescat
* Skript - mainClass - change
- Add version to addon

* Skript - mainClass - change
- Shortened everything down to getFullName

* Revert "Skript - mainClass - change - Shortened everything down to getFullName"

This reverts commit 8950547

* Skript - mainClass - changes
- Changed to getFullName
* new CustomModelData expressions/condition

* ExprItemWithCustomModelData - changes
- Remove a line i had for testing/reading
- Import ParseResult directly

* CondHasCustomModelData - changes
- Forgot the RequiredPlugins 1.14 part for this class

* CondHasCustomModelData - changes
- Use itemtypes instead of itemstacks

* ExprCustomModelData - changes
- Use itemtypes instead of itemstacks

* ExprCustomModelData - changes
- Changed item meta call

* CustomModelData - changes
- Added a test for custom model data

* ExprCustomModelData - changes
- moved test script
* HealthUtils - update
- Removed some really old code that was used before MC 1.6
- Updated to use newer attributes to make this class more future proof in the event the deprecated Damageable#getMaxHealth and Damageable#setMaxHealth methods are removed

* HealthUtils - update
- Added a test script for health utils
* ExprClientViewDistance - new

* ExprClientViewDistance - changes
- Changed to SimplePropertyExpression as suggested by Blueyescat

* ExprClientViewDistance - changes
- forgot plural

* ExprClientViewDistance - changes
- Removed parenthesis as requested by Bensku

* ExprClientViewDistance - changes
- Add explanation to difference between player view distance and client view distance
* FishData

* Comparison Fixes

Asterisk Asterisk Asterisk

* Add Space

Co-Authored-By: Giovanni <42092549+Matocolotoe@users.noreply.github.com>
* ExprExplodedBlocks - new

* ExprItemWithPotionEffects - changes
- Split up examples onto separate lines

* ExprExplodedBlocks - changes
- Remove "destroyed" from pattern to cut down confusion with break events
- Fix an issue where using a right-click event for a block, would fire for spruce boats
- Fix an issue with the ordering of villager professions
* Make ExprSpawnLocation a location

ExprSpawnLocation used to be a number, this commit makes it a Location instead.

* Fix reloading scripts in subfolders

This commit fixes reloading scripts in subfolders as described here: #2612

* revert change for cleaner PRs

reverted this change since it hasn't been merged to SkriptLang/master and this branch should not contain any other changes.
@Wealthyturtle Wealthyturtle merged commit efe3c60 into Wealthyturtle:feature/hotbar-button Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants