Commit Graph
78 Commits
Author SHA1 Message Date
Hubry 8e2b09527a Update TC integration to beta 21, small tweaks to aspects (#2693)
* Formatting fixes for my previous PRs

* Bump Forge, JEI and Thaumcraft and specify some of them in mod deps

Forge to latest recommended (TC requires it)
Thaumcraft to Beta 21 (the new aspect registration)
JEI to stable 4.10.0.198 (mostly for testing purposes like Thaumic JEI)

* Move to the aspect event and tweak some item aspects
2018-08-18 14:03:25 -05:00
Hubry 58346ad107 Update Thaumcraft integration (#2667)
* Pull TC6 from Curseforge's maven thing, remove API classes from repo

* Update Thaumcraft integration

* Make upgrade recipes move attached Thaumcraft item data properly
* Fix full mana inkwells pulled from creative menu not working
* Blacklist flux rifts instead of (removed) aura nodes from gravity rod
* Clean up a few TODOs around Thaumcraft integration
* Finally, assign Thaumcraft aspects to Botania items

* Add config for aspects.

Just in case of some bugs in Thaumcraft, or for modpack makers who want
to customize, so they don't have to disable everything by hand.
2018-07-12 22:58:16 -07:00
Jared ba245a1499 Maven and jenkins stuff (#2623)
* Add the jenkins build number

* Create Jenkinsfile

* no crashes when no private.properties

* Changed to setupCIWorkspace
2018-06-18 19:27:57 -07:00
Vincent Lee d9d3015ffb Get Baubles from Maven, no more downloading a broken -deobf jar manually 2017-12-17 21:32:25 -06:00
Vasco Lavos 775c0d20c3 Have fun Jared 2017-12-12 22:28:04 +00:00
Vasco Lavos 97cc9fe5f6 Build files 2017-09-02 19:02:41 +01:00
Vincent Lee 789a380e7d Move things to AT so we know when they break immediately 2017-06-25 11:43:35 -05:00
Vincent Lee e0e5503fe8 Bump JEI, get things running 2017-06-25 01:18:06 -05:00
Vincent Lee 16f2322db0 Update gradle 2017-06-16 07:16:41 -05:00
Vasco Lavos 1a1620af41 AAAAAAAAAAAAAA 2017-03-10 18:39:05 +00:00
Vasco Lavos 8ddce9b20c Update JEI 2017-03-10 18:11:15 +00:00
Vincent Lee 294a0b1879 Update buildscript 2017-01-04 23:10:42 -06:00
Vasco Lavos a1993a10c8 Belated build 2016-11-01 18:21:16 +00:00
Vasco Lavos 4d9f300087 Updated for the new version of baubles. Runs, not done yet. 2016-10-11 16:28:05 +01:00
Vasco Lavos 7c5159e76e Add .exe to the exclusion list for building the jar 2016-10-04 20:06:57 +01:00
Vasco Lavos e75ae7b30c Stripped metadata from sprites. Smaller filesize! 2016-10-02 21:36:54 +01:00
Vasco Lavos bb9a45637c Build 322 2016-09-22 18:55:17 +01:00
Vasco Lavos d423d06f2e Remove remnants of willie's updater thing 2016-09-06 00:52:04 +01:00
Vasco Lavos c6f9103b31 Actually update forge. Change stuff around to compile with the default forge mappings. 2016-09-05 23:53:25 +01:00
Vasco Lavos e7753d0a79 Change the forge version to be the same one I'm using in my other mods. Because I'm lazy and can't be bothered to redo my workspace again. I'll probably bump this up later alongside the other mods, but this'll do just for an initial setup. 2016-09-05 23:22:50 +01:00
Vasco Lavos 6a5d5a4f19 MOOOOOOOOOOOVE OOOOOOOOOOUT 2016-09-05 22:31:34 +01:00
Vincent Lee a0d0fefe8d Move to 1.10 2016-07-20 20:55:20 -05:00
Vincent Lee 0b635c5bc7 Fix missed change in gradle 2016-06-29 20:28:36 -05:00
Vincent Lee 589b4e49b6 Prep buildscripts for 1.10.2 2016-06-29 20:24:25 -05:00
Vincent Lee da3958a414 Fix more build stuff 2016-06-25 14:59:39 -05:00
Vincent Lee 4ddf3767c5 Update buildscript for 1.10 2016-06-25 14:50:07 -05:00
Vincent Lee 1a3b6833b5 Update JEI 2016-06-24 19:58:57 -05:00
Vincent Lee cc1b66f3cd Gradle script automatically updates update.json 2016-05-28 12:50:41 -05:00
Vincent Lee 8f00e9bdd6 Build 306 2016-05-19 10:03:24 -05:00
Vincent Lee 8fb3b886a8 Get rid of all the nullable-nonnull stuff, warning huge diff 2016-05-18 21:03:12 -05:00
Vincent Lee 056f46b1f8 Update to 1.9.4 - untested waiting on baubles 2016-05-18 15:22:35 -05:00
Vincent Lee bf0712a75c Build 302 2016-05-10 23:18:46 -05:00
Vincent Lee 072f13d3db Update JEI and add support for recipe category crafting items 2016-05-06 22:24:15 -05:00
Vincent Lee 69db133091 Update forge 2016-04-03 18:47:31 -05:00
Vincent Lee bcd00dbba3 Update JEI, more overrides 2016-03-27 12:05:19 -05:00
Vincent Lee d37518c9f4 Compiles. Update JEI. 2016-03-19 15:58:12 -05:00
Vincent Lee 5821ede5e6 Lots of name substitutions 2016-03-18 10:42:42 -05:00
Vincent Lee 099c02157e Update buildscript and update checker 2016-03-12 16:26:59 -06:00
Vincent Lee 8909b26e99 Update buildscript 2016-03-11 16:04:31 -06:00
Vincent Lee 972d0e5bf6 Safety check in platform model, update JEI 2016-02-08 10:18:12 -06:00
Vincent Lee 8e7f1cfac1 Temporary java 8 reobfuscation fix closes #33. 2016-01-11 11:23:46 -06:00
Vincent Lee b10a642297 Brewery recipe support 2016-01-03 22:02:02 -06:00
Vincent Lee 37b5d00388 Update to 1.8.9, fix apothecary collision 2015-12-29 23:45:26 -06:00
Vincent Lee b8a1a9cd5d Some 1.8.8 fixes before merging upstream 2015-12-21 12:24:28 -06:00
Vincent Lee 750276db9b Merge upstream 2015-11-17 01:07:15 -06:00
Vasco Lavos d8415a8282 Finalize scp upload 2015-11-15 15:46:27 +00:00
Vasco Lavos b82b4e5be1 More work on scp uploading 2015-11-15 15:35:03 +00:00
Vasco Lavos 2975915233 Change gradle upload from FTP to SCP. Untested, will probably explode horribly. 2015-11-15 15:14:36 +00:00
Vincent Lee da2e5dfa51 Update build.gradle 2015-11-13 19:49:41 -06:00
Shadowfacts e1e7fd4c89 Use MC data dir for persistent data
- Fix spelling, it’s “persistent” not “presistant”
- Update CCL, IChunkLoadTile (required by FMP) was added in 1.1.1.109
- Add IDEA files to .gitignore

Fixes #1340
2015-09-06 11:50:03 -04:00