AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 09:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,015 Commits 29 Branches 143 Tags
Commit Graph

6015 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
payonel
f96108f1a2 Merge branch master-MC1.11 into master-MC1.12 2018-01-20 07:41:43 -08:00
payonel
b5ae93fc21 Merge branch master-MC1.10 into master-MC1.11 2018-01-20 07:41:37 -08:00
payonel
f84fb968c3 Merge branch master-MC1.7.10 into master-MC1.10 2018-01-20 07:41:18 -08:00
payonel
28bf5b7cfe RIGHT ... setBackground returns number, number when paletted 
derp
 2018-01-20 07:37:23 -08:00
Anar Abdullayev
eec9173066 Update robot.names (#2607) 2018-01-11 06:26:15 -08:00
Ruukas
65fc2664f0 Added Robot names (#2555) 
Got a little creative with some of them.. I have been interested in robots and robot movies for a while and got kind of caught in it. Most of robots/AIs I thought of were already in the list, but I think these would make some nice additions to the list.
 2018-01-11 06:18:05 -08:00
Matthew Beeching
c78cf08b1c Update uuid.lua to generate RFC4122 valid version 4 UUIDs 2018-01-11 06:16:12 -08:00
SDPhantom
1a8cd8db99 Update robot.names 
Added a couple Reaper names along with an ally from Mass Effect
 2018-01-08 06:50:24 -08:00
payonel
8015d1788c use SlotCrafting and support repair crafting 2018-01-07 12:31:19 -08:00
payonel
4c0d17d6fb install cleaning 
reverting a change from july 2017, that had the installer ignore a source if it came from the only rw candidate, when running the multi-selection util. I can see the irritation or confusion of the user when running the installer and it considers a secondary drive as a viable source candidate. Typically, a system would have additional hdds merely to store data. Typically the ro loot floppies are the desired source candidates. I believe the intention here was: "We have multiple source candidates, but only one is rw, thus it is probable that the rw candidate isn't actually intended for install" But I disagree, when testing custom floppies there will easily be one additional rw source.

Also, this change includes some additional command line clarification. If the system selects a source automatically, the first prompt the user sees is where to install. This can be jarring or confusing -- as the user doesn't know yet WHAT is being installed. In that case, we now display what is up for installation before asking where to install it.
 2018-01-07 03:21:09 -08:00
payonel
1758e35e77 revert craft repair fix as it seems to break 1.12 2018-01-05 23:13:09 -08:00
payonel
639e460a3d Merge branch master-MC1.11 into master-MC1.12 2018-01-05 07:15:50 -08:00
payonel
0073c26745 fixing case in docs 2018-01-05 07:15:48 -08:00
payonel
6563fe5b44 Merge branch master-MC1.10 into master-MC1.11 2018-01-05 07:04:03 -08:00
payonel
fb1130cd5f Merge branch master-MC1.7.10 into master-MC1.10 2018-01-05 07:01:48 -08:00
payonel
8ef72f6bfe case fix 2018-01-05 07:01:36 -08:00
payonel
22f9af2ab0 Merge remote-tracking branch 'master-MC1.11' into master-MC1.12 2018-01-05 06:13:43 -08:00
payonel
47def83811 merge fixes for carpet capacitors 2018-01-05 05:57:58 -08:00
payonel
da9a68fc2e Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11 
# Conflicts:
#	src/main/resources/assets/opencomputers/lang/en_US.lang
#	src/main/scala/li/cil/oc/Constants.scala
#	src/main/scala/li/cil/oc/Localization.scala
#	src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
 2018-01-03 07:02:55 -08:00
payonel
73c2eac5cf correct merge for carpeted capacitor 2018-01-03 05:50:28 -08:00
payonel
1b37905525 Merge remote-tracking branch 'master-MC1.7.10' into master-MC1.10 
# Conflicts:
#	src/main/scala/li/cil/oc/Localization.scala
#	src/main/scala/li/cil/oc/integration/Mods.scala
 2018-01-02 21:30:59 -08:00
payonel
f8bfbf55b1 make component inventory components array even more lazy 
allow a component inventory to define its inventory size from nbt even after the components array has been accessed. The array will appear to be size zero until initialized

closes #2522
 2018-01-02 20:59:09 -08:00
payonel
8a4b1fa4f5 add sheep power 
- add carpeted capacitor and configurations
- remove check for power providing mod
- remove localization about power check
 2018-01-01 12:02:13 -08:00
payonel
2d611528c9 Merge branch master-MC1.11 into master-MC1.12 2017-12-31 10:49:44 -08:00
payonel
f04c60d2c9 Merge branch master-MC1.10 into master-MC1.11 2017-12-31 10:49:42 -08:00
payonel
dd3763f0e1 Merge branch master-MC1.7.10 into master-MC1.10 2017-12-31 10:49:31 -08:00
payonel
7432030d16 reduce glyph log noise 2017-12-31 10:42:25 -08:00
payonel
14933e87d8 Merge branch master-MC1.11 to master-MC1.12 2017-12-31 10:32:34 -08:00
payonel
6ccf337996 fixing more merge issues 
# Conflicts:
#	src/main/resources/assets/opencomputers/models/item/wlanCard.json
#	src/main/resources/assets/opencomputers/models/item/wlanCard1.json
#	src/main/resources/assets/opencomputers/models/item/wlancard.json
 2017-12-31 10:31:05 -08:00
payonel
0d7743fcef item texture fixes for new items 2017-12-31 10:02:00 -08:00
payonel
28e09825e1 Merge branch master-MC1.11 into master-MC1.12 2017-12-31 00:35:20 -08:00
payonel
8be2816b0c fix bad merge 2017-12-31 00:34:18 -08:00
payonel
6caf59fffa Merge branch master-MC1.10 into master-MC1.11 
# Conflicts:
#	src/main/scala/li/cil/oc/common/init/Items.scala
 2017-12-31 00:23:52 -08:00
payonel
f2eb66fa26 fix bad merge 2017-12-31 00:03:08 -08:00
payonel
7cab775901 allow setting chars to remove preceding wide chars 2017-12-30 22:45:26 -08:00
payonel
3b4d077e97 Merge branch master-MC1.11 into master-MC1.12 
# Conflicts:
#	src/main/scala/li/cil/oc/server/component/MotionSensor.scala
 2017-12-26 16:45:44 -08:00
payonel
5a6d2b2d5a Merge branch master-MC1.10 into master-MC1.11 
# Conflicts:
#	build.gradle
#	src/main/resources/assets/opencomputers/doc/de_DE/item/index.md
#	src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard.md
#	src/main/resources/assets/opencomputers/doc/de_DE/item/wlanCard1.md
#	src/main/resources/assets/opencomputers/doc/de_de/item/wlancard.md
#	src/main/resources/assets/opencomputers/doc/en_US/item/index.md
#	src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard.md
#	src/main/resources/assets/opencomputers/doc/en_US/item/wlanCard1.md
#	src/main/resources/assets/opencomputers/doc/en_us/item/wlancard.md
#	src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard.md
#	src/main/resources/assets/opencomputers/doc/fr_FR/item/wlanCard1.md
#	src/main/resources/assets/opencomputers/doc/fr_fr/item/wlanCard.md
#	src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard.md
#	src/main/resources/assets/opencomputers/doc/ru_RU/item/wlanCard1.md
#	src/main/resources/assets/opencomputers/doc/ru_ru/item/wlanCard.md
#	src/main/resources/assets/opencomputers/lang/en_US.lang
#	src/main/resources/assets/opencomputers/lang/fr_FR.lang
#	src/main/resources/assets/opencomputers/lang/it_IT.lang
#	src/main/resources/assets/opencomputers/lang/pt_BR.lang
#	src/main/resources/assets/opencomputers/lang/pt_PT.lang
#	src/main/resources/assets/opencomputers/lang/ru_RU.lang
#	src/main/resources/assets/opencomputers/lang/zh_CN.lang
#	src/main/resources/assets/opencomputers/lang/zh_TW.lang
#	src/main/resources/assets/opencomputers/recipes/default.recipes
#	src/main/resources/assets/opencomputers/recipes/gregtech.recipes
#	src/main/resources/assets/opencomputers/recipes/hardmode.recipes
#	src/main/resources/assets/opencomputers/recipes/peaceful.recipes
#	src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
#	src/main/resources/assets/opencomputers/textures/items/wlanCard.png
#	src/main/resources/assets/opencomputers/textures/items/wlancard.png
#	src/main/scala/li/cil/oc/Constants.scala
#	src/main/scala/li/cil/oc/common/Proxy.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
#	src/main/scala/li/cil/oc/common/tileentity/Relay.scala
#	src/main/scala/li/cil/oc/server/component/LinkedCard.scala
#	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
#	src/main/scala/li/cil/oc/util/FontUtils.scala
 2017-12-26 16:42:22 -08:00
payonel
3b40a8e1b8 Merge branch master-MC1.7.10 into master-MC1.10 
# Conflicts:
#	src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard.png
#	src/main/resources/assets/opencomputers/textures/items/WirelessNetworkCard1.png
#	src/main/resources/assets/opencomputers/textures/items/wlanCard.png
#	src/main/scala/li/cil/oc/Settings.scala
#	src/main/scala/li/cil/oc/common/Proxy.scala
#	src/main/scala/li/cil/oc/common/init/Items.scala
#	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
#	src/main/scala/li/cil/oc/common/tileentity/Relay.scala
#	src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
 2017-12-26 07:49:29 -08:00
Vexatos
d26277ff4b Retain packet data when necessary. 
For #2695.
 2017-12-24 12:35:36 +01:00
payonel
f9cd34580a fixing motion sensor again 
stuff changed again between 1.7.10 to 1.10

closes #2692
 2017-12-23 01:31:56 -08:00
payonel
d67156ed52 update font.hex (thanks @asie) and drop wcwidth.bin 
now server loads glyph sizes by parsing font.hex

closes #2676
 2017-12-22 07:48:50 -08:00
Aaron Gallagher
231fa13fb9 Fix the crafting upgrade to use SlotCrafting. 
This handles basically all of the funky corner cases around crafting,
including things like decrementing stacks and repairing items and all
of the necessary event posting. Tested to work correctly with IC2's
Forge Hammer too.

Should fix #2532.
 2017-12-18 21:51:03 -08:00
payonel
9c509508a7 French translation fixes 
Thanks to @Naheulf
Closes #2061
 2017-12-18 17:47:26 -08:00
Xyxen
fd9b81582b Fix runClient and runServer Gradle tasks (#2673) 
Compile dependencies are placed on the runtime classpath by Gradle.
Because the compile configuration is set to extend from the provided
config, all of those dependencies are put on the runtime classpath as
well.

In this patch, provided is instead made a separate configuration, and
explicitly added to ONLY the compile classpath of the main sourceset.
 2017-12-17 21:10:31 -08:00
payonel
daef43aef7 revert Optional removal from 1.12 2017-12-17 21:03:24 -08:00
payonel
9917cadd8b reverted @Optional removal that was meant for < 1.11 2017-12-17 20:45:51 -08:00
payonel
719498163c fix relays save/load without wireless cards 2017-12-16 01:16:45 -08:00
Xyxen
62c661649b Fix wrong Gradle version being used on Travis CI (#2672) 
Using the default Gradle install on Travis is dangerous, because a
version upgrade on their end could break the build. It's already broken
because the version of ForgeGradle the current script relies on expects
ScalaCompileOptions.setUseAnt to exist, but it was removed in Gradle 3.

This patch reconfigures Travis to use the Gradle wrapper instead, which
standardizes the version in use.
 2017-12-15 21:06:48 -08:00
payonel
aa375ec823 fix config/settings to expect 1.7.2 next, not 1.7.3 2017-12-15 05:38:20 -08:00
payonel
22c6b15d39 missed settings changes needed for t1 card and version check 2017-12-14 09:50:15 -08:00