mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-12 03:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,352 Commits 11 Branches 122 Tags
4d8e36cb0554f23b9e61ab42abc862bc92cacf6c
Commit Graph
97 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Fopiano 4d8e36cb05 Update bug.yml 2023-07-24 04:34:17 -04:00
Brian Fopiano 9ba4dd4099 Merge pull request #995 from CocoTheOwner/printWrongSpawner 
Better print information about wrong spawner on marker
 2023-06-11 14:00:09 -04:00
Brian Fopiano 006b0b4a03 Update README.md 2023-04-29 18:52:20 -04:00
Brian Fopiano 0fda7a8506 Merge pull request #990 from CrazyDev05/oraxen_implementation_fix 2023-04-11 00:06:06 -04:00
Brian Fopiano 051015656a Merge pull request #986 from CocoTheOwner/re-slope-condition 
Patches an issue with slope conditions when placing with commands
 2023-04-04 14:00:19 -04:00
Brian Fopiano e967b5e052 Merge pull request #982 from CocoTheOwner/re-slope-condition 
Reimplement slope condition
 2023-04-02 15:39:42 -04:00
Brian Fopiano 3ec2f8fb7b Merge pull request #962 from CocoTheOwner/render-continent-v2 
Replace continent renderer with biomeStream
 2023-03-05 19:18:54 -05:00
Brian Fopiano 6c5fac154e Merge pull request #975 from CocoTheOwner/mm-fix 
Fixed mythicmobs and implements it properly.
 2023-03-05 19:18:10 -05:00
Brian Fopiano 17d2ac8d70 Merge pull request #973 from CocoTheOwner/spawn-entity 
Entity spawn command for testing
 2023-03-03 14:38:23 -08:00
Brian Fopiano a6ebdead19 Merge pull request #966 from CocoTheOwner/update-world-nice 
nicer command :)
 2023-03-03 14:37:31 -08:00
Brian Fopiano aa7631ecd0 Merge pull request #974 from CocoTheOwner/copypastafix 
Fix copy paste of string gone wrong
 2023-03-03 14:37:04 -08:00
Brian Fopiano f5c64c7480 Merge pull request #960 from CocoTheOwner/render-continent 
Continent (i.e. heightmap + ocean/land division) render
 2023-02-15 14:47:14 -08:00
Brian Fopiano 085f63a915 Merge pull request #961 from CocoTheOwner/slopes-rotation 
Implements slope rotation
 2023-02-15 14:46:48 -08:00
Brian Fopiano 3e022e1931 Merge pull request #954 from CocoTheOwner/slopes 
Slope condition
 2023-02-15 14:46:28 -08:00
Brian Fopiano 0dba3725ae Merge pull request #953 from CocoTheOwner/mm-set-stuff 
MM should set its own stuff
 2023-02-15 14:44:42 -08:00
Brian Fopiano 8bb409df4e Merge pull request #952 from CocoTheOwner/fix-image-math 
Fix image mapping math
 2023-02-15 14:44:09 -08:00
Brian Fopiano 603168a147 Merge pull request #951 from CocoTheOwner/fix-decree-conv 
Actually check for origin on command invoke
 2023-02-15 14:42:57 -08:00
Brian Fopiano c7ecdaf8a8 Merge pull request #944 from ColorsWind/Development 
fix issue with `bukkit.yml` world-container option
 2023-01-15 12:02:28 -08:00
Brian Fopiano e5e6b9848f Merge pull request #943 from simon44556/master 
- Update ender eye usage to ignore portal frame clicks
 2022-12-25 18:06:14 -05:00
Brian Fopiano 065b748036 Merge pull request #938 from VolmitSoftware/Development 
Development
 2022-12-09 18:09:21 -08:00
Brian Fopiano 87302a046c Merge pull request #933 from VolmitSoftware/Development 
Development
 2022-11-30 10:07:07 -08:00
Brian Fopiano 5f2b82aac7 Merge pull request #926 from VolmitSoftware/Development 
Development
 2022-11-12 13:34:06 -08:00
Brian Fopiano a64272620f Merge pull request #920 from VolmitSoftware/Development 
Development
 2022-10-28 13:14:47 -07:00
Brian Fopiano 7b93542014 Merge pull request #916 from VolmitSoftware/Development 
Grad
 2022-10-21 02:01:15 -07:00
Brian Fopiano 72a077662d Merge pull request #915 from VolmitSoftware/Development 
V+
 2022-10-12 02:54:10 -07:00
Brian Fopiano f6fbcade17 Merge pull request #913 from VolmitSoftware/Development 
Development
 2022-10-07 18:58:13 -07:00
Brian Fopiano 7729ce3753 Merge pull request #911 from VolmitSoftware/Development 
Development
 2022-09-30 21:19:06 -07:00
Brian Fopiano 8331cbe375 Merge pull request #910 from VolmitSoftware/Development 
Hotfix
 2022-09-25 16:43:11 -07:00
Brian Fopiano a248962f1b Merge pull request #909 from VolmitSoftware/Development 
Development
 2022-09-23 20:03:37 -07:00
Brian Fopiano 9cf2785626 Merge pull request #908 from VolmitSoftware/iris-go-fast-but-not-stable 
Pregen improvements
 2022-09-21 07:27:20 -07:00
Brian Fopiano b8b65c7e3e Merge pull request #907 from VolmitSoftware/Development 
Development
 2022-09-21 07:13:01 -07:00
Brian Fopiano aa1be934a9 Merge pull request #899 from VolmitSoftware/iris-go-fast-but-not-stable 
Jesus Fucking Christ
 2022-09-16 02:05:01 -07:00
Brian Fopiano 6d28f57f88 Merge pull request #894 from VolmitSoftware/master 
d
 2022-09-12 16:00:36 -07:00
Brian Fopiano 2f2f857e98 Merge pull request #893 from VolmitSoftware/Development 
Development
 2022-09-12 15:59:20 -07:00
Brian Fopiano 141ca76647 Merge pull request #890 from VolmitSoftware/Development 
Development
 2022-09-09 18:05:56 -07:00
Brian Fopiano 8f7b54a5a4 Merge pull request #889 from VolmitSoftware/Development 
Development
 2022-09-08 17:26:41 -07:00
Brian Fopiano 17df92a07c Merge pull request #887 from VolmitSoftware/Development 
Development
 2022-09-06 20:55:18 -07:00
Brian Fopiano e6def804f8 Merge pull request #883 from VolmitSoftware/Development 
Development
 2022-09-02 17:48:22 -07:00
Brian Fopiano fb294fc03c Merge pull request #879 from VolmitSoftware/Development 
Changelog:

- Fixed Vines, Again! for Floors
- Merged stability changes
- Made the folder checking system recursive
 2022-08-30 10:20:38 -07:00
Brian Fopiano be39fce741 Merge pull request #876 from VolmitSoftware/Development 
Changelog:

Fixed Versioning compilation issues
Forceblock nolonger Crashes
Forceblock Works now (as intended, as far as we can tell)
 2022-08-26 16:10:38 -07:00
Brian Fopiano 4fed2e6e5f Merge branch 'master' into Development 2022-08-26 16:10:26 -07:00
Brian Fopiano 1d3681beb4 Merge pull request #872 from VolmitSoftware/Development 
Development
 2022-08-23 18:51:22 -04:00
Brian Fopiano fddacd4410 Merge pull request #863 from VolmitSoftware/Development 
Development Update
 2022-08-18 19:00:04 -07:00
Brian Fopiano 84bb082d44 Merge pull request #856 from VolmitSoftware/Development 
Development
 2022-08-16 13:06:00 -07:00
Brian Fopiano a0db94d84f Merge branch 'master' into Development 2022-08-16 13:05:54 -07:00
Brian Fopiano 340885f939 Merge pull request #849 from VolmitSoftware/Development 
Development
 2022-08-12 15:43:09 -07:00
Brian Fopiano 209458a856 Merge pull request #847 from VolmitSoftware/Development 
Development update
 2022-08-09 13:50:26 -07:00
Brian Fopiano 0ea936f3fe Merge pull request #845 from VolmitSoftware/Development 
Development
 2022-08-04 08:50:17 -07:00
Brian Fopiano dff373e7d5 Merge pull request #843 from CocoTheOwner/sortedNoise 
sort noise
 2022-07-30 16:23:45 -07:00
Brian Fopiano 723b696393 Merge pull request #838 from VolmitSoftware/Development 
Development
 2022-07-29 10:04:58 -07:00
Brian Fopiano f5f89eb4e4 Merge branch 'master' into Development 2022-07-29 10:04:53 -07:00
Brian Fopiano df15332c7f Merge pull request #832 from CocoTheOwner/noWarn 
Remove warning on create
 2022-07-29 10:04:22 -07:00
Brian Fopiano 9628b66a97 Merge pull request #837 from VolmitSoftware/Development 
Development Update
 2022-07-29 10:02:04 -07:00
Brian Fopiano 21775630c3 Merge pull request #830 from VolmitSoftware/Development 
Development
 2022-07-21 19:38:44 -07:00
Brian Fopiano 781aeebef6 Merge pull request #826 from CDFN/patch-1 
Update bug template for 1.19
 2022-07-17 13:17:56 -07:00
Brian Fopiano 5e133fd51a Merge pull request #827 from CocoTheOwner/commands 
Add /iris remove command
 2022-07-17 13:03:58 -07:00
Brian Fopiano 1cb2ea6c17 Merge pull request #829 from VolmitSoftware/Development 
Development
 2022-07-16 15:46:30 -07:00
Brian Fopiano f52cd29e7b Merge pull request #821 from VolmitSoftware/Development 
Development
 2022-07-07 14:23:57 -07:00
Brian Fopiano b5fb277982 Merge pull request #819 from VolmitSoftware/Development 
Development update 2.2.2
 2022-07-01 16:11:20 -07:00
Brian Fopiano 43bd96a679 Merge pull request #810 from VolmitSoftware/Development 
Development
 2022-06-25 14:08:37 -07:00
Brian Fopiano d11baeb08a Merge pull request #800 from VolmitSoftware/Development 
V+
 2022-06-03 20:23:46 -07:00
Brian Fopiano e3d4c32d03 Merge pull request #796 from VolmitSoftware/Development 
**Changelog**

- Fixed a Memory Leak (There might be more, keep reports coming)
 - Fixed Iris wand selections (WE)
 - Added Iris Wand Worldedit compatibility [Make selection using Worldedit, then /Iris object want worldedit (/ir o w we) to then set your selection to a new iris wand]
 2022-05-26 18:24:06 -07:00
Brian Fopiano fff650b766 Merge pull request #795 from VolmitSoftware/Development 
**Changelog:**
- Fixed Startup spam, Worldheight spam, and Entity ID spam from happening anymore
- Removes Raid Error From Villagers (Persistent raid)
- Minheight, MaxHeight, and STilt are now working as intended
- Fixed generation errors causing Holes in bedrock 
- generic math fixes internally

**This will require a world update to fix the Bedrock problems**
 2022-05-21 20:26:19 -07:00
Brian Fopiano 6e4929246d Merge pull request #794 from VolmitSoftware/master 
upstream merge
 2022-05-20 19:48:19 -07:00
Brian Fopiano b7a892ecfe V+ 
Chonker of an update
 2022-05-19 15:44:56 -07:00
Brian Fopiano 79d16102fa Merge pull request #789 from CocoTheOwner/fixDontUse 
Replace MV with bukkit
 2022-05-19 15:43:35 -07:00
Brian Fopiano 0ed0e0c983 Merge pull request #786 from VolmitSoftware/Development 
not a word
 2022-04-16 01:29:41 -07:00
Brian Fopiano 609104cfa8 Merge pull request #785 from VolmitSoftware/Development 
Development
 2022-04-16 01:23:44 -07:00
Brian Fopiano 5b3918fcb1 Merge pull request #782 from VolmitSoftware/Development 
Development
 2022-04-13 16:49:22 -07:00
Brian Fopiano 03554eb372 Merge pull request #778 from VolmitSoftware/Development 
Development
 2022-04-03 01:41:16 -07:00
Brian Fopiano dabfe41f29 Merge branch 'master' into Development 2022-04-03 01:40:24 -07:00
Brian Fopiano ce56224038 Merge pull request #777 from Vatuu/Development 
Fixed MythicMobs api change
 2022-04-02 13:11:13 -07:00
Brian Fopiano 7ddc621009 Merge pull request #769 from VolmitSoftware/Development 
Updated PAPI Support
Temp Disabled Oraxen Support
Temp Disabled Ascync Tp
updated NMS (Colors and binds etc...)
Fixed my registry oopsie (thx Vatuu)
removed Debug Prints
/iris Height works now
Colors Fixed
 2022-03-27 13:51:27 -07:00
Brian Fopiano f4bee872e1 Merge pull request #768 from Vatuu/Development 
Fixes
 2022-03-17 14:49:13 -07:00
Brian Fopiano d99fd56995 Debug/height fixed/removed 
Small fixes.
 2022-03-15 22:18:22 -07:00
Brian Fopiano 851954efb2 Merge pull request #763 from VolmitSoftware/Development 
Development Changes (WIP)
 2022-03-12 15:50:44 -08:00
Brian Fopiano b8c6a459a6 Merge pull request #761 from Vatuu/Development 
Worldheight preperations and absolute fluid height
 2022-03-11 16:07:02 -08:00
Brian Fopiano c3cac7d8c7 Merge pull request #756 from VolmitSoftware/Development 
Development 2.0.1-1.18.X Merge
 2022-03-04 09:51:00 -08:00
Brian Fopiano d1644c0454 Merge pull request #757 from Vatuu/Development 
Made IrisEffect dependent on world's minimum height.
 2022-03-03 13:17:32 -08:00
Brian Fopiano f639c5b14e Merging Stranges Trim Command to see Practicality 
It seems like a neat thing to HAVE even if we wont use it
 2022-02-21 23:41:13 -08:00
Brian Fopiano 699da3cd26 Updates the Listing to support NewHorizon/End 
Update listing.json
 2022-02-21 23:37:07 -08:00
Brian Fopiano 5956c358d0 Merge pull request #723 from CocoTheOwner/villagerPatch 
Remove cartographer villagers due to crashes
 2022-02-09 13:54:16 -08:00
Brian Fopiano f18232eb6c Merge pull request #716 from CocoTheOwner/SuppressZLIBError 
Only print stacktrace when non-ZLIB exception
 2022-02-09 13:52:58 -08:00
Brian Fopiano ac69d57de0 Merge pull request #726 from CocoTheOwner/dimensionDefault 
"Default" IrisDimension instead of "Overworld"
 2022-02-09 13:49:52 -08:00
Brian Fopiano 9297d4a7d2 Merge pull request #724 from CocoTheOwner/noUpdateRendererSpam 
Do not spam renderer updates
 2022-02-09 13:48:22 -08:00
Brian Fopiano e6fd4e2255 Merge pull request #722 from CocoTheOwner/fixCustomOutput 
CocoLocation Fix
 2022-02-09 13:47:43 -08:00
Brian Fopiano c0fa6db602 Merge pull request #735 from CocoTheOwner/noConsoleNPE 
Enable edit context
 2022-02-09 13:47:09 -08:00
Brian Fopiano d61d732a75 Merge pull request #736 from CocoTheOwner/customSpawnEntity 
Context Fix
 2022-02-09 13:46:24 -08:00
Brian Fopiano e9c0ac3c6b Merge pull request #744 from TheHappyHopper/master 
Temp fix for entity spawn height (fixes #730)
 2022-02-09 13:44:20 -08:00
Brian Fopiano e071ecc1d7 Merge branch 'master' into master 2022-02-09 13:43:50 -08:00
Brian Fopiano 14f6ef3da0 Merge pull request #743 from ValkrysFr/master 
Hot fix mob spawning height
 2022-02-09 13:41:58 -08:00
Brian Fopiano 7cfcebf0f5 Merge pull request #713 from ArMiN231/patch-1 2022-01-21 01:36:17 -08:00
Brian Fopiano 6a2e1f0271 Merge pull request #703 from VolmitSoftware/master 
Merge
 2022-01-09 16:49:35 -08:00
Brian Fopiano 876f1231ee Merge pull request #695 from xIRoXaSx/master 
Implementation of #692
 2021-12-27 12:46:46 -08:00
Brian Fopiano a4887ec3c3 Merge pull request #699 from CocoTheOwner/fixDebugMsg 
patch pregen debug
 2021-12-26 18:17:35 -08:00
Brian Fopiano f1185d8f34 Merge pull request #700 from CocoTheOwner/allowMapVisionConsole 
Allow consoles to open the vision gui
 2021-12-26 18:16:58 -08:00
Brian Fopiano 030b2998eb Merge pull request #693 from CocoTheOwner/self-ref 
iris settings self reference
 2021-12-26 18:15:41 -08:00