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,703 Commits 11 Branches 122 Tags
9ac4024e4e0fb24732eda81078ab5901d245157f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Fopiano a6281483dd Merge pull request #1084 from RePixelatedMC/PixelatedDev 
Pixelated dev
 2024-03-31 12:45:06 -04:00
Brian Fopiano f68f25b92f Merge pull request #1083 from VolmitDev/fix_object_collision_check 
fix object collision check
 2024-03-30 17:51:40 -04:00
Brian Fopiano 767cca36c8 Merge pull request #1080 from svdgoor/no-camel-1-19-R3 
Cancels Camel spawns on 1-19-R3
 2024-03-30 17:50:44 -04:00
Brian Fopiano b30172fe89 Merge pull request #1082 from VolmitDev/shut_up_spigot 
Remove usage of System.out
 2024-03-30 17:49:31 -04:00
Brian Fopiano 352ee7a622 Merge pull request #1079 from VolmitDev/better_plugin_compat 
Better plugin compat
 2024-03-17 02:55:19 -04:00
Brian Fopiano f26d0fac0b Merge pull request #1078 from VolmitDev/fix_v1_19_R3 
Remove Cherry Grove from 1.19.4 biomes list
 2024-03-17 02:55:03 -04:00
Brian Fopiano a01d27d273 Merge pull request #1075 from VolmitDev/fix_pregen 
Fix Pregen oversight
 2024-02-22 18:42:16 -05:00
Brian Fopiano 43f642ae8b Merge pull request #1076 from VolmitDev/custom-spawn-reason 
Add implement custom spawn reason
 2024-02-22 18:41:59 -05:00
Brian Fopiano cd3e9f772d Merge pull request #1074 from MoritzR200/master 
Fixed file separators in '/iris import'
 2024-02-17 09:54:59 -05:00
Brian Fopiano 7a95441799 Merge pull request #1071 from VolmitDev/fix_nullpointer 
Fix nullpointer
 2024-02-17 09:54:40 -05:00
Brian Fopiano 9345828c97 Merge pull request #1073 from RePixelatedMC/PixelatedDev 
Fixes?
 2024-02-17 09:54:14 -05:00
Brian Fopiano c9a07bd9d7 Merge pull request #1069 from RePixelatedMC/PixelatedDev 
This should be the last pr for the update
 2024-01-26 07:35:39 -05:00
Brian Fopiano 7d4c9d6c1e Merge pull request #1066 from VolmitDev/better-version-compat 
Better version compat
 2024-01-25 10:51:56 -05:00
Brian Fopiano e68b1a52ee Merge pull request #1067 from RePixelatedMC/PixelatedDev 
Feature and fIxes!
 2024-01-25 10:51:45 -05:00
Brian Fopiano 1b3916749a Merge pull request #1063 from RePixelatedMC/PixelatedDev 
Quite some more fixes
 2024-01-12 10:38:06 -05:00
Brian Fopiano c11b5342e3 Merge pull request #1062 from RePixelatedMC/master 
Fixed a rare crash - Crazydev
 2023-12-30 08:56:53 -05:00
Brian Fopiano dff7665934 Merge pull request #1053 from RePixelatedMC/Pixeldev 
Pixeldev
 2023-12-29 16:32:21 -05:00
Brian Fopiano 5685e25234 Merge pull request #1061 from CrazyDev05/build_fix 
fix missing dependency
 2023-12-23 14:43:07 -05:00
Brian Fopiano dd5b9b2e81 Merge pull request #1060 from CrazyDev05/build_fix 
Build fix
 2023-12-23 12:32:09 -05:00
Brian Fopiano ccc0b0dd7d Merge pull request #1057 from CrazyDev05/single_nms 
add ability to only compile for one mc version
 2023-12-22 20:03:58 -05:00
Brian Fopiano 1114ede267 Merge pull request #1058 from IkyMax/master 
Update to 1.20.4
 2023-12-22 20:03:37 -05:00
Brian Fopiano 5546f12499 Merge pull request #1052 from CrazyDev05/worldedit_fix 
Worldedit fix
 2023-12-22 20:03:24 -05:00
Brian Fopiano 4f38acb592 Merge pull request #1055 from CrazyDev05/multiversion_fix 
NoSuchFieldError: CHERRY_GROVE fix
 2023-12-22 20:03:11 -05:00
Brian Fopiano 7f91d73d27 Merge pull request #1051 from RePixelatedMC/Pixeldev 
Whoops
 2023-11-15 12:24:00 -05:00
Brian Fopiano b6ae649cd1 Merge pull request #1050 from RePixelatedMC/Pixeldev 
Mem leak Fix + more
 2023-11-15 10:02:52 -05:00
Brian Fopiano f6b51c21d5 Merge pull request #1049 from RePixelatedMC/Pixeldev 
[ Ready ] SAFEGUARD
 2023-11-06 17:21:55 -05:00
Brian Fopiano 68a4eee8bb Merge pull request #1047 from CrazyDev05/executable_items 
add ExecutableItems Implementation
 2023-11-04 11:17:14 -04:00
Brian Fopiano 746ebfffbd Merge pull request #1044 from CrazyDev05/object_fix 
Object Spawning pattern fix
 2023-11-04 11:16:44 -04:00
Brian Fopiano 213f8645bc Merge pull request #1045 from CrazyDev05/papi_fix 
Fix PapiExpansion not persisting after papi reload
 2023-11-04 11:16:14 -04:00
Brian Fopiano 1b2541bd84 Merge pull request #1043 from CrazyDev05/build_fix 
build.gradle fix
 2023-11-04 11:15:57 -04:00
Brian Fopiano 0ecefdcc1c Merge pull request #1041 from CrazyDev05/multi_version 
Make Iris multi version compatible
 2023-10-23 05:17:34 -04:00
Brian Fopiano 79e198d441 Merge pull request #1038 from RePixelatedMC/repixelatedmc 
Repixelatedmc
 2023-10-22 23:17:53 -04:00
Brian Fopiano e6cf33e262 Merge pull request #1040 from CrazyDev05/repo_fix 
Fix build.gradle

Thanks
 2023-10-22 23:17:26 -04:00
Brian Fopiano c1de316ed6 Merge pull request #1036 from CrazyDev05/teleport 
Add Teleport Command
 2023-10-04 03:22:29 -04:00
Brian Fopiano 1e316acd64 Merge pull request #1037 from CrazyDev05/jigsaw_piece_mantle_panic_fix 
Fix IrisJigsawPiece tectonic plate panic
 2023-10-04 03:21:43 -04:00
Brian Fopiano 5061791dcf Merge pull request #1034 from RePixelatedMC/master 
Fixed - /iris object undo / Added - IrisLootEvent
 2023-09-27 08:15:06 -04:00
Brian Fopiano ce98264552 Merge pull request #1033 from CrazyDev05/jigsaw_loot_fix_2 
Better Jigsaw loot fix
 2023-09-27 08:14:51 -04:00
Brian Fopiano 99d3dba440 Merge pull request #1026 from CocoTheOwner/jigsawRotationFix 
Disable initial rotation if set to true
 2023-09-17 13:47:51 -04:00
Brian Fopiano 5a44e79ad1 Merge pull request #1022 from CrazyDev05/jigsaw_loot_fix 
Jigsaw loot fix
 2023-09-17 13:47:26 -04:00
Brian Fopiano dcfd5a0cd8 Merge pull request #1010 from theDAVID543/master 
fix bug
 2023-08-31 14:41:28 -04:00
Brian Fopiano 2190f6eff8 Merge pull request #1003 from CocoTheOwner/better-pregen-pred 
Predict the ETA for pregeneration more rapidly
 2023-07-29 03:04:07 -07:00
Brian Fopiano ce30e24e42 Merge pull request #1002 from CocoTheOwner/pregen-center-rescale 
Fixes a scaling issue with pregen center
 2023-07-29 03:03:27 -07:00
Brian Fopiano d5e13541c8 Merge pull request #1000 from christolis/fix-macos-build-error 
Fix unresolved dependency error
 2023-07-29 03:03:11 -07:00
Brian Fopiano 2e707adaa0 Merge branch 'master' into fix-macos-build-error 2023-07-29 03:03:00 -07:00
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