mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
669 Commits 18 Branches 104 Tags
Commit Graph

669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Baker
3ec70f9fb3 Merge branch 'master' of https://github.com/cyberpwnn/Iris into citizens 2020-10-21 18:05:51 -07:00
BuildTools
6199256058 Poor attempt at adding pregen pausing 
Please fix /command/CommandIrisPregen.java (has // TODO:)
and
/util/PregenJob.java
(has // TODO:)
 2020-10-21 17:47:20 +02:00
Daniel Mills
265936a791 V+ 2020-10-21 11:11:32 -04:00
BuildTools
2422013ddf fix typo 2020-10-21 17:10:19 +02:00
Daniel Mills
2641220fb0 Fix pregen resume issue 2020-10-21 11:04:19 -04:00
Daniel Mills
68e1830d8e Fix std loot 2020-10-21 11:01:59 -04:00
Daniel Mills
fd3f20ed52 Fixes & revert 2020-10-21 10:28:40 -04:00
Daniel Mills
ccdb136b9a Tweaks 2020-10-21 10:03:15 -04:00
Daniel Mills
0a0617c5fc Command fixes 2020-10-21 10:02:36 -04:00
Daniel Mills
b3e1c48f97 Stupid spigot & paper 2020-10-20 10:52:30 -04:00
Daniel Mills
88d589bae5 1.16 NMS Support 2020-10-20 10:16:19 -04:00
Daniel Mills
0fb5cbdb06 Hmm 2020-10-20 09:51:48 -04:00
Daniel Mills
d47da11ce8 INMS 2020-10-20 09:22:14 -04:00
Daniel Mills
743a4f97ba NMS 2020-10-20 09:22:09 -04:00
Daniel Mills
eac1247f36 FIxes 2020-10-19 10:04:06 -04:00
Daniel Mills
57f60326f3 PF 2020-10-19 09:20:57 -04:00
Daniel Mills
3235f6e388 V+ 2020-10-19 06:10:41 -04:00
Daniel Mills
a607a6a137 Fix structure manager with paper & worldedit 2020-10-19 06:10:37 -04:00
Daniel Mills
2348d4a855 Fix block data issues 2020-10-19 06:10:27 -04:00
Daniel Mills
e16f6c87c2 Remove loot tries 2020-10-19 06:10:19 -04:00
Daniel Mills
598962f5f3 Entities support baby & panda genes 2020-10-19 06:10:11 -04:00
Daniel Mills
8a241bb671 Fix loot 2020-10-19 06:10:03 -04:00
Daniel Mills
8bcb3d9e0e Fix npe and cmod on parallax layer 2020-10-19 06:09:54 -04:00
Daniel Mills
2317220666 What block show more info 2020-10-19 06:09:41 -04:00
Daniel Mills
47c1b58aa5 Loot fixes 2020-10-19 06:09:34 -04:00
Daniel Mills
0039582f28 Summon command 2020-10-19 06:09:28 -04:00
Daniel Mills
60a529375c Fix Regen Crash 2020-10-19 03:46:05 -04:00
Daniel Mills
d42bcb0ab9 Fix fx and spawning before terrain is setup 2020-10-19 03:43:33 -04:00
Daniel Mills
4b11bcb77b Merge remote-tracking branch 'origin/master' 2020-10-19 03:28:04 -04:00
Daniel Mills
6775edddab Move listing to iris dims 2020-10-19 03:27:56 -04:00
Andrew
039a732148
Update .gitignore 2020-10-18 16:36:22 -07:00
Andrew
9aac70c734 Remove IDEA cancer 2020-10-18 16:35:49 -07:00
Andrew
dc6c38cf24
Update .gitignore 2020-10-18 16:33:57 -07:00
Andrew
a2b09cb2aa Remove Iris.iml from repo 2020-10-18 16:32:06 -07:00
Andrew
6e6453f897
Update .gitignore 2020-10-18 16:29:25 -07:00
Andrew
f16de65934 Remove .idea from repo 2020-10-18 16:27:54 -07:00
Daniel Mills
fa0a5efb25 VP 2020-10-18 16:42:03 -04:00
Daniel Mills
1ffb6b9395 WC 2020-10-18 16:41:40 -04:00
Andrew
16d746fb8d Add Citizens support to IrisEntity.java 2020-10-18 11:44:30 -07:00
Andrew
e8629fab66 Add CitizensLink class variable to Iris.java 2020-10-18 11:40:51 -07:00
Andrew
9cb9719461 Create Citizenslink 2020-10-18 11:27:31 -07:00
Daniel Mills
564f02b188 Reload config command 2020-10-18 13:22:50 -04:00
Daniel Mills
d67596117f Fixes 2020-10-18 08:39:26 -04:00
Daniel Mills
ffecbb2298 Merge remote-tracking branch 'origin/master' 2020-10-18 08:39:20 -04:00
Andrew
b5fe2bcc60 Add Citizens to pom.xml 2020-10-17 17:30:43 -07:00
Andrew
7641d6dbdf IDEA bs 2020-10-17 17:07:34 -07:00
Andrew
54c5e3a8e3 Merge remote-tracking branch 'origin/master' 2020-10-17 17:06:35 -07:00
Andrew
d8427cdbcd IDEA bs 2020-10-17 17:05:57 -07:00
Andrew
fe03a12bec
Update README.md 2020-10-17 15:36:59 -07:00
Andrew
37fca3fc3e Update IDEA files 2020-10-17 13:45:12 -07:00